bytes as array

hutool-json/src/main/java/cn/hutool/json/JSONUtil.java

@@ -1,6 +1,5 @@
 package cn.hutool.json;
 
-import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.file.FileReader;
 import cn.hutool.core.lang.TypeReference;
@@ -785,12 +784,6 @@ public class JSONUtil {
 
 			// JSONArray
 			if (object instanceof Iterable || ArrayUtil.isArray(object)) {
-				if(object instanceof byte[]){
-					// issue#I59LW4
-					// json内容中的bytes默认转为Base64
-					return Base64.encode((byte[]) object);
-				}
-
 				return new JSONArray(object, jsonConfig);
 			}
 			// JSONObject

hutool-json/src/main/java/cn/hutool/json/ObjectMapper.java

@@ -144,13 +144,13 @@ public class ObjectMapper {
 		} else if (source instanceof InputStream) {
 			mapFromTokener(new JSONTokener((InputStream) source, jsonArray.getConfig()), jsonArray, filter);
 		} else if (source instanceof byte[]) {
-			// bytes按照JSON的二进制流对待
+			final byte[] bytesSource = (byte[]) source;
-			try{
+			if('[' == bytesSource[0] && ']' == bytesSource[bytesSource.length - 1]){
-				mapFromTokener(new JSONTokener(IoUtil.toStream((byte[]) source), jsonArray.getConfig()), jsonArray, filter);
+				mapFromTokener(new JSONTokener(IoUtil.toStream(bytesSource), jsonArray.getConfig()), jsonArray, filter);
-			} catch (final JSONException ignore){
+			}else{
 				// https://github.com/dromara/hutool/issues/2369
 				// 非标准的二进制流，则按照普通数组对待
-				for(final byte b : (byte[]) source){
+				for(final byte b : bytesSource){
 					jsonArray.add(b);
 				}
 			}

hutool-json/src/main/java/cn/hutool/json/serialize/JSONWriter.java

@@ -1,6 +1,5 @@
 package cn.hutool.json.serialize;
 
-import cn.hutool.core.codec.Base64;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TemporalAccessorUtil;
@@ -226,13 +225,7 @@ public class JSONWriter extends Writer {
 		} else if (value instanceof Map || value instanceof Map.Entry) {
 			new JSONObject(value).write(writer, indentFactor, indent);
 		} else if (value instanceof Iterable || value instanceof Iterator || ArrayUtil.isArray(value)) {
-			if(value instanceof byte[]){
+			new JSONArray(value).write(writer, indentFactor, indent);
-				// issue#I59LW4
-				// json内容中的bytes默认转为Base64
-				writeStrValue(Base64.encode((byte[]) value));
-			}else{
-				new JSONArray(value).write(writer, indentFactor, indent);
-			}
 		} else if (value instanceof Number) {
 			writeNumberValue((Number) value);
 		} else if (value instanceof Date || value instanceof Calendar || value instanceof TemporalAccessor) {

hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java

@@ -1,6 +1,5 @@
 package cn.hutool.json;
 
-import cn.hutool.core.convert.Convert;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -9,15 +8,18 @@ import java.util.List;
 public class Issue2377Test {
 
 	@Test
-	public void bytesTest(){
+	public void bytesTest() {
-		Object[] paramArray = new Object[]{ 1,new byte[]{10,11}, "报表.xlsx"};
+		final Object[] paramArray = new Object[]{1, new byte[]{10, 11}, "报表.xlsx"};
-		String paramsStr = JSONUtil.toJsonStr(paramArray);
+		final String paramsStr = JSONUtil.toJsonStr(paramArray);
+		Assert.assertEquals("[1,[10,11],\"报表.xlsx\"]", paramsStr);
 
-		List<Object> paramList = JSONUtil.toList(paramsStr, Object.class);
+		final List<Object> paramList = JSONUtil.toList(paramsStr, Object.class);
 
-		String paramBytesStr = JSONUtil.toJsonStr(paramList.get(1));
+		final String paramBytesStr = JSONUtil.toJsonStr(paramList.get(1));
+		Assert.assertEquals("[10,11]", paramBytesStr);
 
-		final byte[] convert = Convert.convert(byte[].class, paramBytesStr);
+		final byte[] paramBytes = JSONUtil.toBean(paramBytesStr, byte[].class, false);
-		Assert.assertArrayEquals((byte[])paramArray[1], convert);
+		Assert.assertArrayEquals((byte[]) paramArray[1], paramBytes);
 	}
+
 }

hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java

@@ -8,7 +8,7 @@ public class IssueI59LW4Test {
 	@Test
 	public void bytesTest(){
 		final JSONObject jsonObject = JSONUtil.createObj().set("bytes", new byte[]{1});
-		Assert.assertEquals("{\"bytes\":\"AQ==\"}", jsonObject.toString());
+		Assert.assertEquals("{\"bytes\":[1]}", jsonObject.toString());
 
 		final byte[] bytes = jsonObject.getBytes("bytes");
 		Assert.assertArrayEquals(new byte[]{1}, bytes);
@@ -17,7 +17,7 @@ public class IssueI59LW4Test {
 	@Test
 	public void bytesInJSONArrayTest(){
 		final JSONArray jsonArray = JSONUtil.createArray().set(new byte[]{1});
-		Assert.assertEquals("[\"AQ==\"]", jsonArray.toString());
+		Assert.assertEquals("[[1]]", jsonArray.toString());
 
 		final byte[] bytes = jsonArray.getBytes(0);
 		Assert.assertArrayEquals(new byte[]{1}, bytes);