From 441e14f0e75b3b1d31748ea12fad68f280928efb Mon Sep 17 00:00:00 2001
From: "mike.wq" <mike.wq@alibaba-inc.com>
Date: Wed, 14 Aug 2024 15:18:20 +0800
Subject: [PATCH] fix(#io) : fix io read

---
 app-stream-api/pom.xml                        |  2 +-
 .../dingtalk/open/app/api/util/IoUtils.java   | 20 +++++++++++--------
 app-stream-client/pom.xml                     |  4 ++--
 .../app-stream-network-api/pom.xml            |  4 ++--
 .../app-stream-network-core/pom.xml           |  2 +-
 .../app-stream-network-rsocket/pom.xml        |  2 +-
 .../app-stream-network-ws/pom.xml             |  2 +-
 app-stream-network/pom.xml                    |  2 +-
 app-stream-protocol/pom.xml                   |  2 +-
 dingtalk-stream/pom.xml                       |  4 ++--
 pom.xml                                       |  2 +-
 version.sh                                    |  2 +-
 12 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/app-stream-api/pom.xml b/app-stream-api/pom.xml
index a2b9de8..ca35ea9 100644
--- a/app-stream-api/pom.xml
+++ b/app-stream-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/util/IoUtils.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/util/IoUtils.java
index c24dc3d..c28e58e 100644
--- a/app-stream-api/src/main/java/com/dingtalk/open/app/api/util/IoUtils.java
+++ b/app-stream-api/src/main/java/com/dingtalk/open/app/api/util/IoUtils.java
@@ -1,5 +1,6 @@
 package com.dingtalk.open.app.api.util;
 
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 
 /**
@@ -7,16 +8,19 @@
  * @date 2023/3/1
  */
 public class IoUtils {
-    public static byte[] readAll(InputStream stream) throws Exception {
-        if (stream == null) {
+    private static final int EOF = -1;
+    private static final int BUFFER_SIZE = 4 * 1024;
+
+    public static byte[] readAll(InputStream input) throws Exception {
+        if (input == null) {
             return null;
         }
-        int count = stream.available();
-        byte[] content = new byte[count];
-        while (count > 0) {
-            int readBytes = stream.read(content);
-            count -= readBytes;
+        ByteArrayOutputStream output = new ByteArrayOutputStream(1024);
+        byte[] buffer = new byte[BUFFER_SIZE];
+        int n;
+        while (EOF != (n = input.read(buffer))) {
+            output.write(buffer, 0, n);
         }
-        return content;
+        return output.toByteArray();
     }
 }
diff --git a/app-stream-client/pom.xml b/app-stream-client/pom.xml
index 19c8c05..f963b48 100644
--- a/app-stream-client/pom.xml
+++ b/app-stream-client/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <name>app-stream-client</name>
 
     <dependencies>
diff --git a/app-stream-network/app-stream-network-api/pom.xml b/app-stream-network/app-stream-network-api/pom.xml
index b150560..994ba61 100644
--- a/app-stream-network/app-stream-network-api/pom.xml
+++ b/app-stream-network/app-stream-network-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-network-api</artifactId>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <packaging>jar</packaging>
 
     <name>app-stream-network-api</name>
diff --git a/app-stream-network/app-stream-network-core/pom.xml b/app-stream-network/app-stream-network-core/pom.xml
index f85330a..a9e4d55 100644
--- a/app-stream-network/app-stream-network-core/pom.xml
+++ b/app-stream-network/app-stream-network-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-rsocket/pom.xml b/app-stream-network/app-stream-network-rsocket/pom.xml
index 84ab6a3..b673bd1 100644
--- a/app-stream-network/app-stream-network-rsocket/pom.xml
+++ b/app-stream-network/app-stream-network-rsocket/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-ws/pom.xml b/app-stream-network/app-stream-network-ws/pom.xml
index cc20728..8adc938 100644
--- a/app-stream-network/app-stream-network-ws/pom.xml
+++ b/app-stream-network/app-stream-network-ws/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/pom.xml b/app-stream-network/pom.xml
index 68cf3fa..053d68c 100644
--- a/app-stream-network/pom.xml
+++ b/app-stream-network/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/app-stream-protocol/pom.xml b/app-stream-protocol/pom.xml
index cbe6306..bfc4f44 100644
--- a/app-stream-protocol/pom.xml
+++ b/app-stream-protocol/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
     </parent>
 
     <artifactId>app-stream-protocol</artifactId>
diff --git a/dingtalk-stream/pom.xml b/dingtalk-stream/pom.xml
index cd71397..e52a0d9 100644
--- a/dingtalk-stream/pom.xml
+++ b/dingtalk-stream/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.6</version>
+        <version>1.3.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dingtalk-stream</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <name>app-stream-client</name>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 213acd0..db080c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.dingtalk.open</groupId>
     <artifactId>open-app-stream-client</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.6</version>
+    <version>1.3.7</version>
     <modules>
         <module>app-stream-client</module>
         <module>app-stream-api</module>
diff --git a/version.sh b/version.sh
index 5700dea..a554fd9 100755
--- a/version.sh
+++ b/version.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-mvn versions:set -DnewVersion=1.3.6
+mvn versions:set -DnewVersion=1.3.7