feat(swagger): update swagger

Author: jaronnie

cmd/check.go

@@ -52,15 +52,15 @@ var checkCmd = &cobra.Command{
 			log.Fatalln("[jzero-env] env check failed, protoc-gen-go-grpc is not installed")
 		}
 
-		log.Info("\n[jzero-env]: looking up goctl-swagger")
-		_, err = env.LookPath("goctl-swagger")
+		log.Info("\n[jzero-env]: looking up jzero-swagger")
+		_, err = env.LookPath("jzero-swagger")
 		if err != nil {
-			_ = golang.Install("github.com/jzero-io/goctl-swagger@latest")
+			_ = golang.Install("github.com/jzero-io/jzero-swagger@latest")
 		}
-		if _, err = env.LookPath("goctl-swagger"); err == nil {
-			log.Success(`[jzero-env]: "goctl-swagger" is installed`)
+		if _, err = env.LookPath("jzero-swagger"); err == nil {
+			log.Success(`[jzero-env]: "jzero-swagger" is installed`)
 		} else {
-			log.Warning("[jzero-env] warning: env check failed, goctl-swagger is not installed")
+			log.Warning("[jzero-env] warning: env check failed, jzero-swagger is not installed")
 		}
 
 		log.Info("\n[jzero-env]: looking up protoc-gen-openapiv2")

cmd/gen.go

@@ -298,6 +298,7 @@ func init() {
 		genCmd.AddCommand(genSwaggerCmd)
 
 		genSwaggerCmd.Flags().StringP("output", "o", filepath.Join("desc", "swagger"), "set swagger output dir")
+		genSwaggerCmd.Flags().BoolP("route2code", "", false, "is generate route2code")
 	}
 
 	{

config/config.go

@@ -122,6 +122,7 @@ type GenSwaggerConfig struct {
 	Desc       []string `mapstructure:"desc"`
 	DescIgnore []string `mapstructure:"desc-ignore"`
 	Output     string   `mapstructure:"output"`
+	Route2Code bool     `mapstructure:"route2code"`
 }
 
 type GenZrpcclientConfig struct {

internal/gen/genswagger/gen.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/samber/lo"
+	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/tools/goctl/api/parser"
 	"github.com/zeromicro/go-zero/tools/goctl/rpc/execx"
 	"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
@@ -84,7 +85,12 @@ func Gen() (err error) {
 				if goPackage, ok := parse.Info.Properties["go_package"]; ok {
 					apiFile = fmt.Sprintf("%s.swagger.json", strings.ReplaceAll(goPackage, "/", "-"))
 				}
-				cmd := exec.Command("goctl", "api", "plugin", "-plugin", "goctl-swagger=swagger -filename "+apiFile+" --schemes http,https", "-api", cv, "-dir", config.C.Gen.Swagger.Output)
+				cmd := exec.Command("goctl", "api", "plugin", "-plugin", "jzero-swagger=swagger -filename "+apiFile+" --schemes http,https", "-api", cv, "-dir", config.C.Gen.Swagger.Output)
+				if config.C.Gen.Route2Code || config.C.Gen.Swagger.Route2Code {
+					cmd = exec.Command("goctl", "api", "plugin", "-plugin", "jzero-swagger=swagger -filename "+apiFile+" --schemes http,https --route2code", "-api", cv, "-dir", config.C.Gen.Swagger.Output)
+				}
+
+				logx.Debug(cmd.String())
 				resp, err := cmd.CombinedOutput()
 				if err != nil {
 					return errors.Wrap(err, strings.TrimRight(string(resp), "\r\n"))