Merge remote-tracking branch 'origin/2.7.x'

# Conflicts: # build.gradle
lets-mica · Nov 28, 2023 · 6bb5c36 · 6bb5c36
2 parents 8e5b997 + 3a469d3
commit 6bb5c36
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/mica-http/src/main/java/net/dreamlu/mica/http/FormBuilder.java b/mica-http/src/main/java/net/dreamlu/mica/http/FormBuilder.java
@@ -20,6 +20,7 @@
 
 import javax.annotation.Nullable;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * 表单构造器
@@ -52,10 +53,13 @@ public FormBuilder addEncoded(String name, @Nullable Object encodedValue) {
 		return this;
 	}
 
+	public FormBuilder add(Consumer<FormBody.Builder> consumer) {
+		consumer.accept(this.formBuilder);
+		return this;
+	}
+
 	public HttpRequest build() {
-		FormBody formBody = formBuilder.build();
-		this.request.form(formBody);
-		return this.request;
+		return this.request.form(this.formBuilder.build());
 	}
 
 	public Exchange execute() {

diff --git a/mica-http/src/main/java/net/dreamlu/mica/http/MultipartFormBuilder.java b/mica-http/src/main/java/net/dreamlu/mica/http/MultipartFormBuilder.java
@@ -28,7 +28,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * 表单构造器
@@ -102,11 +104,20 @@ public MultipartFormBuilder add(MultipartBody.Part part) {
 		return this;
 	}
 
+	public MultipartFormBuilder addList(List<MultipartBody.Part> partList) {
+		for (MultipartBody.Part part : partList) {
+			this.formBuilder.addPart(part);
+		}
+		return this;
+	}
+
+	public MultipartFormBuilder add(Consumer<MultipartBody.Builder> consumer) {
+		consumer.accept(this.formBuilder);
+		return this;
+	}
+
 	public HttpRequest build() {
-		formBuilder.setType(MultipartBody.FORM);
-		MultipartBody formBody = formBuilder.build();
-		this.request.multipartForm(formBody);
-		return this.request;
+		return this.request.multipartForm(this.formBuilder.setType(MultipartBody.FORM).build());
 	}
 
 	public Exchange execute() {