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 slash escape bug

Browse Source
This commit is contained in:
Looly 2020-04-25 09:31:39 +08:00
parent 669d19eab8
commit 2bcad6031d
5 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,10 +3,11 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
## 5.3.3 (2020-04-23) ## 5.3.3 (2020-04-25)
### 新特性 ### 新特性
### Bug修复 ### Bug修复
* 【json 】 修复JSON转字符串时</被转义问题
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

2
hutool-json/src/main/java/cn/hutool/json/InternalJSONUtil.java
View File

@ -31,7 +31,7 @@ final class InternalJSONUtil {
* *
* @param writer Writer * @param writer Writer
* @param value 值 * @param value 值
* @param indentFactor 每一级别的缩进量 * @param indentFactor 缩进因子，定义每一级别增加的缩进量
* @param indent 缩进空格数 * @param indent 缩进空格数
* @param config 配置项 * @param config 配置项
* @return Writer * @return Writer

17
hutool-json/src/main/java/cn/hutool/json/JSONUtil.java
View File

@ -599,13 +599,13 @@ public final class JSONUtil {
} }
char b; // 前一个字符 char b; // 前一个字符
char c = 0; // 当前字符 char c; // 当前字符
int len = str.length(); int len = str.length();
if (isWrap) { if (isWrap) {
writer.write('"'); writer.write('"');
} }
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
b = c; // b = c;
c = str.charAt(i); c = str.charAt(i);
switch (c) { switch (c) {
case '\\': case '\\':
@ -613,12 +613,13 @@ public final class JSONUtil {
writer.write("\\"); writer.write("\\");
writer.write(c); writer.write(c);
break; break;
case '/': //此处转义导致输出不和预期一致
if (b == '<') { // case '/':
writer.write('\\'); // if (b == '<') {
} // writer.write('\\');
writer.write(c); // }
break; // writer.write(c);
// break;
default: default:
writer.write(escape(c)); writer.write(escape(c));
} }

9
hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
View File

@ -142,6 +142,15 @@ public class JSONObjectTest {
Console.log(json2); Console.log(json2);
} }
@Test
public void parseStringWithSlashTest() {
//在5.3.2之前，</div>中的/会被转义，修复此bug的单元测试
String jsonStr = "{\"a\":\"<div>aaa</div>\"}";
JSONObject json = new JSONObject(jsonStr);
Assert.assertEquals("<div>aaa</div>", json.get("a"));
Assert.assertEquals(jsonStr, json.toString());
}
@Test @Test
public void toBeanTest() { public void toBeanTest() {
JSONObject subJson = JSONUtil.createObj().set("value1", "strValue1").set("value2", "234"); JSONObject subJson = JSONUtil.createObj().set("value1", "strValue1").set("value2", "234");

6
hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
View File

@ -93,11 +93,11 @@ public class JSONUtilTest {
map.put("user", object.toString()); map.put("user", object.toString());
JSONObject json = JSONUtil.parseObj(map); JSONObject json = JSONUtil.parseObj(map);
Assert.assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"<\\/\"}", json.get("user")); Assert.assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"</\"}", json.get("user"));
Assert.assertEquals("{\"user\":\"{\\\"name\\\":\\\"123123\\\",\\\"value\\\":\\\"\\\\\\\\\\\",\\\"value2\\\":\\\"<\\\\/\\\"}\"}", json.toString()); Assert.assertEquals("{\"user\":\"{\\\"name\\\":\\\"123123\\\",\\\"value\\\":\\\"\\\\\\\\\\\",\\\"value2\\\":\\\"</\\\"}\"}", json.toString());
JSONObject json2 = JSONUtil.parseObj(json.toString()); JSONObject json2 = JSONUtil.parseObj(json.toString());
Assert.assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"<\\/\"}", json2.get("user")); Assert.assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"</\"}", json2.get("user"));
} }
/** /**