fix: pkg import style correct; put embeded PageReq to the first

Author: robocanic

app/dubbo-admin/dubbo-admin.yaml

@@ -33,9 +33,9 @@ console:
         instance: xx
         service: xx
   auth:
-    type: oath2
-    oauth2:
-      clientId: xx
+    user: admin
+    password: dubbo@2025
+    expirationTime: 3600
 store:
   type: mysql
   address: xx

go.mod

@@ -18,7 +18,6 @@ module github.com/apache/dubbo-admin
 go 1.23.0
 
 require (
-	dubbo.apache.org/dubbo-go/v3 v3.3.0
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
 	github.com/bakito/go-log-logr-adapter v0.0.2

go.sum

@@ -34,8 +34,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-dubbo.apache.org/dubbo-go/v3 v3.3.0 h1:jhwK4nQ1DsKQ6H9p7icZx0jg9ulF1vpAA/c0Ly8Et4w=
-dubbo.apache.org/dubbo-go/v3 v3.3.0/go.mod h1:zu2m9tUGaZYfuaMX82pLlwmq7Vl4s5eenZNBGdfAagc=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=

pkg/config/app/admin.go

@@ -37,7 +37,7 @@ type AdminConfig struct {
 	// Diagnostics configuration
 	Diagnostics *diagnostics.Config `json:"diagnostics,omitempty"`
 	// Console configuration
-	Console *console.Config `json:"admin"`
+	Console *console.Config `json:"console"`
 	// Store configuration
 	Store *store.Config `json:"store"`
 	// Discovery configuration

pkg/console/handler/condition_rule.go

@@ -24,7 +24,6 @@ import (
 	"net/http"
 	"strings"
 
-	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 	"github.com/gin-gonic/gin"
 	"github.com/mitchellh/mapstructure"
 
@@ -33,6 +32,7 @@ import (
 	"github.com/apache/dubbo-admin/pkg/console/model"
 	"github.com/apache/dubbo-admin/pkg/console/service"
 	"github.com/apache/dubbo-admin/pkg/core/consts"
+	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 )
 
 func ConditionRuleSearch(cs consolectx.Context) gin.HandlerFunc {

pkg/console/handler/configurator_rule.go

@@ -22,17 +22,17 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/apache/dubbo-admin/pkg/core/manager"
-	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
-	coremodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
-	"github.com/apache/dubbo-admin/pkg/core/store/index"
 	"github.com/duke-git/lancet/v2/strutil"
 	"github.com/gin-gonic/gin"
 
 	consolectx "github.com/apache/dubbo-admin/pkg/console/context"
 	"github.com/apache/dubbo-admin/pkg/console/model"
 	"github.com/apache/dubbo-admin/pkg/console/service"
 	"github.com/apache/dubbo-admin/pkg/core/consts"
+	"github.com/apache/dubbo-admin/pkg/core/manager"
+	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
+	coremodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
+	"github.com/apache/dubbo-admin/pkg/core/store/index"
 )
 
 func ConfiguratorSearch(ctx consolectx.Context) gin.HandlerFunc {

pkg/console/handler/instance.go

@@ -22,7 +22,6 @@ import (
 	"strconv"
 	"strings"
 
-	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 	"github.com/duke-git/lancet/v2/strutil"
 	"github.com/gin-gonic/gin"
 	"github.com/pkg/errors"
@@ -32,6 +31,7 @@ import (
 	"github.com/apache/dubbo-admin/pkg/console/model"
 	"github.com/apache/dubbo-admin/pkg/console/service"
 	"github.com/apache/dubbo-admin/pkg/core/consts"
+	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 	corestore "github.com/apache/dubbo-admin/pkg/core/store"
 )
 

pkg/console/handler/prometheus.go

@@ -24,8 +24,9 @@ import (
 	"net/http/httputil"
 	"net/url"
 
-	consolectx "github.com/apache/dubbo-admin/pkg/console/context"
 	"github.com/gin-gonic/gin"
+
+	consolectx "github.com/apache/dubbo-admin/pkg/console/context"
 )
 
 func PromQL(ctx consolectx.Context) gin.HandlerFunc {

pkg/console/handler/search.go

@@ -20,12 +20,12 @@ package handler
 import (
 	"net/http"
 
-	coremodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
 	"github.com/gin-gonic/gin"
 
 	consolectx "github.com/apache/dubbo-admin/pkg/console/context"
 	"github.com/apache/dubbo-admin/pkg/console/model"
 	"github.com/apache/dubbo-admin/pkg/console/service"
+	coremodel "github.com/apache/dubbo-admin/pkg/core/resource/model"
 )
 
 func BannerGlobalSearch(ctx consolectx.Context) gin.HandlerFunc {

pkg/console/handler/service.go

@@ -21,14 +21,14 @@ import (
 	"net/http"
 	"strconv"
 
-	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 	"github.com/gin-gonic/gin"
 
 	meshproto "github.com/apache/dubbo-admin/api/mesh/v1alpha1"
 	consolectx "github.com/apache/dubbo-admin/pkg/console/context"
 	"github.com/apache/dubbo-admin/pkg/console/model"
 	"github.com/apache/dubbo-admin/pkg/console/service"
 	"github.com/apache/dubbo-admin/pkg/core/consts"
+	meshresource "github.com/apache/dubbo-admin/pkg/core/resource/apis/mesh/v1alpha1"
 	corestore "github.com/apache/dubbo-admin/pkg/core/store"
 )