Support InputStream type upload.

gudaoxuri · Apr 12, 2024 · 176df9d · 176df9d
1 parent b290b8e
commit 176df9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,3 @@
 {
-    "java.debug.settings.onBuildFailureProceed": true,
-    "java.configuration.updateBuildConfiguration": "interactive"
+    "java.debug.settings.onBuildFailureProceed": true
 }
diff --git a/README.adoc b/README.adoc
@@ -35,7 +35,7 @@ NOTE: 文档地址： http://gudaoxuri.github.io/dew-common/[http://gudaoxuri.gi
 <dependency>
   <groupId>com.ecfront.dew</groupId>
   <artifactId>common</artifactId>
-  <version>4.0.0-rc.1</version>
+  <version>4.0.0-rc.2</version>
 </dependency>
 ----
 

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
     <description>Dew公共模块</description>
     <url>https://github.com/gudaoxuri/dew-common</url>
     <packaging>jar</packaging>
-    <version>4.0.0-rc.1</version>
+    <version>4.0.0-rc.2</version>
 
     <properties>
         <java.version>21</java.version>
@@ -36,7 +36,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.compilerVersion>${java.version}</maven.compiler.compilerVersion>
-        <jackson.version>2.15.3</jackson.version>
+        <jackson.version>2.17.0</jackson.version>
         <beanutils.version>1.9.4</beanutils.version>
         <jbcrypt.version>0.4</jbcrypt.version>
         <slf4j.version>2.0.9</slf4j.version>

diff --git a/src/main/java/com/ecfront/dew/common/HttpHelper.java b/src/main/java/com/ecfront/dew/common/HttpHelper.java
@@ -872,8 +872,7 @@ public ResponseWrap request(String method, String url, Object body, Map<String,
                             try {
                                 return new FileInputStream(fileBody);
                             } catch (FileNotFoundException e) {
-                                e.printStackTrace();
-                                return null;
+                                throw new RTIOException(e);
                             }
                         }, fileBody.getName(), $.mime.getContentType(fileBody));
                         header.put("Content-Type", "multipart/form-data; boundary=" + publisher.getBoundary());
@@ -889,6 +888,10 @@ public ResponseWrap request(String method, String url, Object body, Map<String,
                             entity = HttpRequest.BodyPublishers.ofString(((Date) body).getTime() + "", Charset.forName(requestCharset));
                         } else if (body instanceof File) {
                             entity = HttpRequest.BodyPublishers.ofFile(((File) body).toPath());
+                        } else if (body instanceof InputStream) {
+                            entity = HttpRequest.BodyPublishers.fromPublisher(
+                                    HttpRequest.BodyPublishers.ofInputStream(() -> (InputStream) body),
+                                    ((InputStream) body).available());
                         } else {
                             entity = HttpRequest.BodyPublishers.ofString($.json.toJsonString(body), Charset.forName(requestCharset));
                         }