reghao před 4 roky
rodič
revize
321788a7f0

+ 6 - 18
jdk/src/main/java/cn/reghao/jutil/jdk/http/UploadParam.java

@@ -1,6 +1,6 @@
 package cn.reghao.jutil.jdk.http;
 
-import java.io.InputStream;
+import java.io.File;
 import java.util.Map;
 
 /**
@@ -8,29 +8,17 @@ import java.util.Map;
  * @date 2021-12-28 13:06:23
  */
 public class UploadParam {
-    private final String filePath;
-    private final InputStream inputStream;
+    private final File file;
     private final String mimeType;
     private Map<String, String> textParams;
 
-    public UploadParam(String filePath, String mimeType) {
-        this.filePath = filePath;
-        this.inputStream = null;
+    public UploadParam(File file, String mimeType) {
+        this.file = file;
         this.mimeType = mimeType;
     }
 
-    public UploadParam(InputStream inputStream, String mimeType) {
-        this.filePath = null;
-        this.inputStream = inputStream;
-        this.mimeType = mimeType;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public InputStream getInputStream() {
-        return inputStream;
+    public File getFile() {
+        return file;
     }
 
     public String getMimeType() {

+ 3 - 9
tool/src/main/java/cn/reghao/jutil/tool/http/DefaultWebRequest.java

@@ -80,19 +80,13 @@ public class DefaultWebRequest extends BaseWebRequest implements WebRequest {
 
     @Override
     public WebResponse upload(String url, UploadParam uploadParam) {
-        String filePath = uploadParam.getFilePath();
         MultipartEntityBuilder builder = MultipartEntityBuilder.create();
         builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
         builder.setCharset(StandardCharsets.UTF_8);
 
-        if (filePath != null) {
-            File file = new File(uploadParam.getFilePath());
-            FileBody fileBody = new FileBody(file, uploadParam.getMimeType());
-            builder.addPart("file", fileBody);
-        } else {
-            InputStreamBody inputStreamBody = new InputStreamBody(uploadParam.getInputStream(), uploadParam.getMimeType());
-            builder.addPart("file", inputStreamBody);
-        }
+        File file = uploadParam.getFile();
+        FileBody fileBody = new FileBody(file, uploadParam.getMimeType());
+        builder.addPart("file", fileBody);
 
         Map<String, String> map = uploadParam.getTextParams();
         if (map != null) {