update multipart format generate

Author: xnzone

internal/genapi/gen.go

@@ -112,6 +112,7 @@ func parseRestMethod(fd *descriptor.FileDescriptorProto, serv *descriptor.Servic
 		ReqTyp:   typeName(meth.GetInputType()),
 		ResTyp:   typeName(meth.GetOutputType()),
 	}
+	data.Comment = strings.ReplaceAll(data.Comment, "\n", "\n\t//")
 	switch {
 	case meth.GetClientStreaming():
 		data.ReqCode = fmt.Sprintf(noClientStream, meth.GetName())

internal/genapi/rest.go

@@ -65,13 +65,13 @@ func buildBody(m *descriptor.MethodDescriptorProto, rest *restInfo) string {
 	var bc string
 	switch typ {
 	case BODY_FORM:
-		forms := buildBodyForm(m, rest)
+		forms := buildBodyForm(m, rest, false)
 		if len(forms) <= 0 {
 			break
 		}
 		bc, _ = buildBodyFormCode(strings.Join(forms, "\n\t"))
 	case BODY_MULTI:
-		forms := buildBodyForm(m, rest)
+		forms := buildBodyForm(m, rest, true)
 		if len(forms) <= 0 {
 			break
 		}
@@ -83,7 +83,7 @@ func buildBody(m *descriptor.MethodDescriptorProto, rest *restInfo) string {
 	return code.String()
 }
 
-func buildBodyForm(m *descriptor.MethodDescriptorProto, rest *restInfo) []string {
+func buildBodyForm(m *descriptor.MethodDescriptorProto, rest *restInfo, multi bool) []string {
 	queryParams := map[string]*descriptor.FieldDescriptorProto{}
 	request := descInfo.Type[m.GetInputType()].(*descriptor.DescriptorProto)
 	if rest.body != "*" {
@@ -101,7 +101,10 @@ func buildBodyForm(m *descriptor.MethodDescriptorProto, rest *restInfo) []string
 			queryParams[path] = leaf
 		}
 	}
-	fmtKey := "bodyForms[%q] = %s"
+	fmtKey := "bodyForms.Add(%q, %s)"
+	if multi {
+		fmtKey = `bodyForms.WriteField(%q, %s)`
+	}
 	var parents []string
 
 	if rest.body != "*" && rest.body != "" {

internal/genapi/tmpl.go

@@ -19,6 +19,8 @@ import (
 	bytes "bytes"
 	http "net/http"
 	strings "strings"
+	url "net/url"
+	multipart "mime/multipart"
 )
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = context.Background
@@ -28,6 +30,8 @@ var _ = bytes.Compare
 var _ = json.Marshal
 var _ = strings.Compare
 var _ = fmt.Errorf
+var _ = url.Parse
+var _ = multipart.ErrMessageTooLarge
 
 {{ range .Services }}
 // Client API for {{ .ServName }} service
@@ -68,11 +72,14 @@ var requestCode = `// options
 	opt := buildOptions(c.opts, opts...)
 	headers := make(map[string]string)
 	// route
-	{{ .RouteCode | html }}
+	{{ .RouteCode }}
 	// body
-	var body io.Reader
-	{{ .BodyCode | html }}
+	{{ .BodyCode }}
+	{{- if eq .BodyCode "" -}}
+	req, err := http.NewRequest("{{ .Verb }}", rawURL, nil)
+	{{- else }}
 	req, err := http.NewRequest("{{ .Verb }}", rawURL, body)
+	{{- end }}
 	if err != nil {
 		return nil, err
 	}
@@ -93,31 +100,24 @@ var requestCode = `// options
 	return &res, err 
 `
 
-var bodyFormCode = `bodyForms := make(map[string]string)
-	{{ .Body | html }}
-	var bs []string
-	for k, v := range bodyForms {
-		bs = append(bs, fmt.Sprintf("%s=%s", k, v))
-	}
-	body = strings.NewReader(strings.Join(bs, "&"))
+var bodyFormCode = `bodyForms := url.Values{} 
+	{{ .Body }}
+	body := strings.NewReader(bodyForms.Encode())
 	headers["Content-Type"] = "application/x-www-form-urlencoded"
 `
 
-var bodyMultiCode = `bodyForms := make(map[string]string)
-	{{ .Body | html }}
-	var bs []string
-	for k, v := range bodyForms {
-		bs = append(bs, fmt.Sprintf("%s=%s", k, v))
-	}
-	body = strings.NewReader(strings.Join(bs, "&"))
+var bodyMultiCode = `body := new(bytes.Buffer)
+	bodyForms := multipart.NewWriter(body) 
+	{{ .Body }}
+	defer func() { _ =  bodyForms.Close() } ()
 	headers["Content-Type"] = "multipart/form-data"
 `
 
 var bodyJsonCode = `bs, err := json.Marshal({{ .Body | html }})
 	if err != nil {
 		return nil, err
 	}
-	body = bytes.NewReader(bs)
+	body := bytes.NewReader(bs)
 	headers["Content-Type"] = "application/json"
 `
 

internal/genapi/version.go

@@ -1,3 +1,3 @@
 package genapi
 
-const Version = "v1.0.2"
+const Version = "v1.0.3"