ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix json bug

Browse Source
This commit is contained in:
Looly 2022-06-06 00:45:50 +08:00
parent 6fcb3cd666
commit 1d32b0862d
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hutool-core/src/main/java/cn/hutool/core/convert/impl/ArrayConverter.java
View File

@ -1,13 +1,14 @@
package cn.hutool.core.convert.impl; package cn.hutool.core.convert.impl;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.iter.IterUtil; import cn.hutool.core.collection.iter.IterUtil;
import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.convert.AbstractConverter;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ByteUtil; import cn.hutool.core.util.ByteUtil;
import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.text.StrUtil;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Array; import java.lang.reflect.Array;
@ -124,6 +125,16 @@ public class ArrayConverter extends AbstractConverter<Object> {
return convertArrayToArray(value.toString().toCharArray()); return convertArrayToArray(value.toString().toCharArray());
} }
//issue#2365
// 字符串转bytes，首先判断是否为Base64，是则转换，否则按照默认getBytes方法。
if(targetComponentType == byte.class){
final String str = value.toString();
if(Base64.isBase64(str)){
return Base64.decode(value.toString());
}
return str.getBytes();
}
// 单纯字符串情况下按照逗号分隔后劈开 // 单纯字符串情况下按照逗号分隔后劈开
final String[] strings = StrUtil.splitToArray(value.toString(), CharUtil.COMMA); final String[] strings = StrUtil.splitToArray(value.toString(), CharUtil.COMMA);
return convertArrayToArray(strings); return convertArrayToArray(strings);

20
hutool-json/src/test/java/Issue2365Test.java Normal file
View File

@ -0,0 +1,20 @@
import cn.hutool.json.JSONUtil;
import lombok.Data;
import org.junit.Assert;
import org.junit.Test;
public class Issue2365Test {
@Test
public void toBeanTest(){
String jsonStr = "{\"fileName\":\"aaa\",\"fileBytes\":\"AQ==\"}";
final FileInfo fileInfo = JSONUtil.toBean(jsonStr, FileInfo.class);
Assert.assertEquals("aaa", fileInfo.getFileName());
Assert.assertArrayEquals(new byte[]{1}, fileInfo.getFileBytes());
}
@Data
public static class FileInfo {
private String fileName;
private byte[] fileBytes;
}
}