fix: optimize swagger

rest/httpx/requests.go

@@ -30,19 +30,19 @@ var (
 
 // Parse parses the request.
 func Parse(r *http.Request, v any, isValidate bool) error {
-	if err := ParsePath(r, v); err != nil {
+	if err := ParseJsonBody(r, v); err != nil {
 		return err
 	}
 
-	if err := ParseForm(r, v); err != nil {
+	if err := ParsePath(r, v); err != nil {
 		return err
 	}
 
-	if err := ParseHeaders(r, v); err != nil {
+	if err := ParseForm(r, v); err != nil {
 		return err
 	}
 
-	if err := ParseJsonBody(r, v); err != nil {
+	if err := ParseHeaders(r, v); err != nil {
 		return err
 	}
 

tools/goctl/api/gogen/gendockerfile.go

@@ -2,6 +2,7 @@ package gogen
 
 import (
 	_ "embed"
+	"fmt"
 	"strings"
 
 	"github.com/zeromicro/go-zero/tools/goctl/api/spec"
@@ -23,7 +24,7 @@ func genDockerfile(dir string, api *spec.ApiSpec, g *GenContext) error {
 		builtinTemplate: dockerfileTemplate,
 		data: map[string]string{
 			"serviceName": strings.ToLower(service.Name),
-			"port":        string(g.Port),
+			"port":        fmt.Sprint(g.Port),
 			"imageTag":    "golang:1.20.2-alpine3.17",
 		},
 	})

tools/goctl/api/gogen/genhandlers.go

@@ -50,29 +50,38 @@ func genHandler(dir, rootPkg string, cfg *config.Config, group spec.Group, route
 	var handlerDoc *strings.Builder
 	handlerDoc = &strings.Builder{}
 
-	handlerDoc.WriteString(fmt.Sprintf("// swagger:route %s %s %s %s \n", route.Method, route.Path, group.GetAnnotation("group"), strings.TrimSuffix(handler, "Handler")))
+	var isParameterRequest bool
+	if route.RequestType != nil && strings.Contains(strings.Join(route.RequestType.Documents(), ""),
+		"swagger:parameters") {
+		isParameterRequest = true
+	} else {
+		isParameterRequest = false
+	}
+
+	var swaggerPath string
+	if strings.Contains(route.Path, ":") {
+		swaggerPath = ConvertRoutePathToSwagger(route.Path)
+	} else {
+		swaggerPath = route.Path
+	}
+
+	handlerDoc.WriteString(fmt.Sprintf("// swagger:route %s %s %s %s \n", route.Method, swaggerPath,
+		group.GetAnnotation("group"), strings.TrimSuffix(handler, "Handler")))
 	handlerDoc.WriteString("//\n")
 	handlerDoc.WriteString(fmt.Sprintf("%s\n", strings.Join(route.HandlerDoc, " ")))
 	handlerDoc.WriteString("//\n")
 	handlerDoc.WriteString(fmt.Sprintf("%s\n", strings.Join(route.HandlerDoc, " ")))
 	handlerDoc.WriteString("//\n")
 
 	// HasRequest
-	if len(route.RequestTypeName()) > 0 {
-		var inVal string
-		if route.Method == "get" {
-			inVal = "query"
-		} else {
-			inVal = "body"
-		}
-
+	if len(route.RequestTypeName()) > 0 && !isParameterRequest {
 		handlerDoc.WriteString(fmt.Sprintf(`// Parameters:
 			//  + name: body
 			//    require: true
 			//    in: %s
 			//    type: %s
 			//
-			`, inVal, route.RequestTypeName()))
+			`, "body", route.RequestTypeName()))
 	}
 	// HasResp
 	if len(route.ResponseTypeName()) > 0 {

tools/goctl/api/gogen/util.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"os"
 	"strings"
 	"text/template"
 
@@ -36,7 +37,9 @@ func genFile(c fileGenConfig) error {
 	if !created {
 		return nil
 	}
-	defer fp.Close()
+	defer func(fp *os.File) {
+		_ = fp.Close()
+	}(fp)
 
 	var text string
 	if len(c.category) == 0 || len(c.templateFile) == 0 {
@@ -63,7 +66,7 @@ func genFile(c fileGenConfig) error {
 func writeProperty(writer io.Writer, name, tag, comment string, tp spec.Type, doc spec.Doc, indent int) error {
 	// write doc for swagger
 	for _, v := range doc {
-		fmt.Fprintf(writer, "\t%s\n", v)
+		_, _ = fmt.Fprintf(writer, "\t%s\n", v)
 	}
 
 	util.WriteIndent(writer, indent)
@@ -189,3 +192,14 @@ func golangExpr(ty spec.Type, pkg ...string) string {
 
 	return ""
 }
+
+// ConvertRoutePathToSwagger converts route path to swagger format.
+func ConvertRoutePathToSwagger(data string) string {
+	splitData := strings.Split(data, "/")
+	for i, v := range splitData {
+		if strings.Contains(v, ":") {
+			splitData[i] = "{" + v[1:] + "}"
+		}
+	}
+	return strings.Join(splitData, "/")
+}

tools/goctl/api/gogen/util_test.go

@@ -0,0 +1,31 @@
+package gogen
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestConvertRoutePathToSwagger(t *testing.T) {
+	type args struct {
+		data string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "testPath",
+			args: args{
+				data: "/init/test/:name/:age",
+			},
+			want: "/init/test/{name}/{age}",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equalf(t, tt.want, ConvertRoutePathToSwagger(tt.args.data), "ConvertRoutePathToSwagger(%v)", tt.args.data)
+		})
+	}
+}