fix: version command

Author: hunjixin

api/api_impl/server.go

@@ -3,6 +3,7 @@ package apiimpl
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"net"
 	"net/http"
@@ -29,9 +30,6 @@ func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, controller APIContro
 		return err
 	}
 
-	// Clear out the servers array in the swagger spec, that skips validating
-	// that server names match. We don't know how this thing will be run.
-	swagger.Servers = nil
 	// This is how you set up a basic chi router
 	r := chi.NewRouter()
 
@@ -58,9 +56,13 @@ func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, controller APIContro
 					return nil
 				},
 			},
+			SilenceServersWarning: true,
 		}),
 	)
-
+	chi.Walk(r, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
+		fmt.Printf("[%s]: '%s' has %d middlewares\n", method, route, len(middlewares))
+		return nil
+	})
 	api.HandlerFromMuxWithBaseURL(controller, r, APIV1Prefix)
 
 	url, err := url.Parse(apiConfig.Listen)

cmd/helper.go

@@ -0,0 +1,20 @@
+package cmd
+
+import (
+	"github.com/jiaozifs/jiaozifs/api"
+	"github.com/jiaozifs/jiaozifs/config"
+)
+
+func GetDefaultClient() (*api.Client, error) {
+	swagger, err := api.GetSwagger()
+	if err != nil {
+		return nil, err
+	}
+
+	//get runtime version
+	cfg, err := config.LoadConfig(cfgFile)
+	if err != nil {
+		return nil, err
+	}
+	return api.NewClient(cfg.API.Listen + swagger.Servers[0].URL)
+}

cmd/version.go

@@ -3,10 +3,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/jiaozifs/jiaozifs/api"
-	apiimpl "github.com/jiaozifs/jiaozifs/api/api_impl"
-	"github.com/jiaozifs/jiaozifs/config"
 	"github.com/jiaozifs/jiaozifs/version"
+
+	"github.com/jiaozifs/jiaozifs/api"
 	"github.com/spf13/cobra"
 )
 
@@ -23,12 +22,7 @@ var versionCmd = &cobra.Command{
 		fmt.Println("Version ", version.UserVersion())
 		fmt.Println("API Version ", swagger.Info.Version)
 
-		//get runtime version
-		cfg, err := config.LoadConfig(cfgFile)
-		if err != nil {
-			return err
-		}
-		client, err := api.NewClient(cfg.API.Listen + apiimpl.APIV1Prefix)
+		client, err := GetDefaultClient()
 		if err != nil {
 			return err
 		}
@@ -37,10 +31,12 @@ var versionCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+
 		okResp, err := api.ParseGetVersionResponse(versionResp)
 		if err != nil {
 			return err
 		}
+
 		if okResp.JSON200 == nil {
 			return fmt.Errorf("request version fail %d %s", okResp.HTTPResponse.StatusCode, okResp.HTTPResponse.Body)
 		}