Merge pull request #188 from yoyofx/dev

fixed request body max bytes that when upload file
yoyofx · Oct 10, 2021 · b2a1398 · b2a1398
2 parents fce3478 + a53eb09
commit b2a1398
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/examples/simpleweb/config_dev.yml b/examples/simpleweb/config_dev.yml
@@ -6,7 +6,7 @@ yoyogo:
       type: "fasthttp"
       address: ":8080"
       path: "app"
-      max_request_size: 2096157
+      max_request_size: 31457280
       session:
         name: "YOYOGO_SESSIONID"
         timeout: 3600

diff --git a/examples/simpleweb/contollers/usercontroller.go b/examples/simpleweb/contollers/usercontroller.go
@@ -124,3 +124,18 @@ func (controller UserController) QueryBinding(ctx *context.HttpContext) mvc.ApiR
 	}
 	return controller.OK(userInfo)
 }
+
+type UploadForm struct {
+	mvc.RequestBody
+	File *multipart.FileHeader `form:"file1"`
+	Key  string                `form:"key"`
+}
+
+func (controller UserController) Upload(form *UploadForm) mvc.ApiResult {
+	return controller.OK(context.H{
+		"file": form.File.Filename,
+		"size": form.File.Size,
+		"key":  form.Key,
+	})
+
+}
diff --git a/examples/simpleweb/go.mod b/examples/simpleweb/go.mod
@@ -5,10 +5,10 @@ go 1.16
 require (
 	github.com/fasthttp/websocket v1.4.3
 	github.com/go-sql-driver/mysql v1.6.0
-	github.com/jinzhu/copier v0.3.2
+	github.com/jinzhu/copier v0.3.2 // indirect
 	github.com/yoyofx/yoyogo v0.0.0
 	github.com/yoyofxteam/dependencyinjection v1.0.1
-	github.com/yoyofxteam/reflectx v0.2.3
+	github.com/yoyofxteam/reflectx v0.2.3 // indirect
 	gorm.io/gorm v1.21.11
 )
 

diff --git a/web/binding/binding.go b/web/binding/binding.go
@@ -2,6 +2,7 @@ package binding
 
 import (
 	"net/http"
+	"strings"
 	"unsafe"
 )
 
@@ -80,6 +81,9 @@ func Default(method, contentType string) Binding {
 	if method == http.MethodGet {
 		return Form
 	}
+	if strings.HasPrefix(contentType, MIMEMultipartPOSTForm) {
+		return FormMultipart
+	}
 
 	switch contentType {
 	case MIMEJSON:

diff --git a/web/fasthttpserver.go b/web/fasthttpserver.go
@@ -39,8 +39,9 @@ func (server *FastHttpServer) Run(context *abstractions.HostBuilderContext) (e e
 	fastHttpHandler := NewFastHTTPHandler(context.RequestDelegate.(IRequestDelegate))
 
 	server.webserver = &fasthttp.Server{
-		Handler:           fastHttpHandler,
-		KeepHijackedConns: true,
+		Handler:            fastHttpHandler,
+		KeepHijackedConns:  true,
+		MaxRequestBodySize: int(context.HostConfiguration.Server.MaxRequestSize),
 	}
 
 	addr := server.Addr