fix: 修复命令bug;修改部分命令

goodluckxu-go · Feb 20, 2024 · 923e528 · 923e528
1 parent d9d49ef
commit 923e528
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cmd/apigen/main.go b/cmd/apigen/main.go
@@ -38,12 +38,12 @@ func main() {
 				if docPath == "" {
 					docPath = defaultDocPath
 				}
-				outDir, _ := ctx.Value("outDir").(string)
+				outDir, _ := ctx.Value("generateDocsDir").(string)
 				if outDir == "" {
 					outDir = defaultOutDir
 				}
-				ginRouteDir, _ := ctx.Value("ginRouteDir").(string)
-				openapi.GenerateOpenAPI(rootDir, routeDir, docPath, outDir, ginRouteDir)
+				ginGenerateRouteDir, _ := ctx.Value("generateGinRouteDir").(string)
+				openapi.GenerateOpenAPI(rootDir, routeDir, docPath, outDir, ginGenerateRouteDir)
 				return nil
 			},
 			Flags: []cli.Flag{
@@ -63,12 +63,12 @@ func main() {
 					DefaultText: defaultDocPath,
 				},
 				&cli.StringFlag{
-					Name:        "outDir",
+					Name:        "generateDocsDir",
 					Usage:       "生成文档输出目录",
 					DefaultText: defaultOutDir,
 				},
 				&cli.StringFlag{
-					Name:  "ginRouteDir",
+					Name:  "generateGinRouteDir",
 					Usage: "gin生成路由文件",
 				},
 			},

diff --git a/openapi.go b/openapi.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 )
 
-func GenerateOpenAPI(rootDir, routeDir, docPath, outDir, ginRouteOutDir string) {
+func GenerateOpenAPI(rootDir, routeDir, docPath, outDir, ginGenerateRouteDir string) {
 	modPathMap = modHandle{}
 	var err error
 	projectModName, err = modPathMap.load(rootDir)
@@ -40,8 +40,8 @@ func GenerateOpenAPI(rootDir, routeDir, docPath, outDir, ginRouteOutDir string)
 	if err != nil {
 		log.Fatal(err)
 	}
-	if ginRouteOutDir != "" {
+	if ginGenerateRouteDir != "" {
 		gins := ginHandle{}
-		gins.load(openapi.routesFunc, "routes")
+		gins.load(openapi.routesFunc, ginGenerateRouteDir)
 	}
 }