fix #I78PB1

hutool-core/src/test/java/org/dromara/hutool/core/net/URLEncoderTest.java

@@ -1,11 +1,15 @@
 package org.dromara.hutool.core.net;
 
+import org.dromara.hutool.core.lang.Console;
 import org.dromara.hutool.core.net.url.URLDecoder;
 import org.dromara.hutool.core.net.url.URLEncoder;
+import org.dromara.hutool.core.net.url.UrlQuery;
+import org.dromara.hutool.core.util.CharsetUtil;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class URLEncoderTest {
+
 	@Test
 	void encodeTest() {
 		final String body = "366466 - 副本.jpg";
@@ -25,7 +29,7 @@ public class URLEncoderTest {
 	}
 
 	@Test
-	void encodeEmojiTest(){
+	void encodeEmojiTest() {
 		final String emoji = "🐶😊😂🤣";
 		final String encode = URLEncoder.encodeAll(emoji);
 		Assertions.assertEquals("%F0%9F%90%B6%F0%9F%98%8A%F0%9F%98%82%F0%9F%A4%A3", encode);

hutool-core/src/test/java/org/dromara/hutool/core/net/UrlQueryTest.java

@@ -17,16 +17,16 @@ import java.util.TreeMap;
 public class UrlQueryTest {
 
 	@Test
-	public void parseTest(){
+	public void parseTest() {
 		final String queryStr = "a=1&b=111==";
-		final UrlQuery q = new UrlQuery();
+		final UrlQuery q = UrlQuery.of();
 		final UrlQuery parse = q.parse(queryStr, Charset.defaultCharset());
 		Assertions.assertEquals("111==", parse.get("b"));
 		Assertions.assertEquals("a=1&b=111==", parse.toString());
 	}
 
 	@Test
-	public void ofHttpWithoutEncodeTest(){
+	public void ofHttpWithoutEncodeTest() {
 		// charset为null表示不做编码
 		final String url = "https://img-cloud.voc.com.cn/140/2020/09/03/c3d41b93e0d32138574af8e8b50928b376ca5ba61599127028157.png?imageMogr2/auto-orient/thumbnail/500&pid=259848";
 		final UrlBuilder urlBuilder = UrlBuilder.ofHttpWithoutEncode(url);
@@ -35,15 +35,15 @@ public class UrlQueryTest {
 	}
 
 	@Test
-	public void parseTest2(){
+	public void parseTest2() {
 		final String requestUrl = "http://192.168.1.1:8080/pc?=d52i5837i4ed=o39-ap9e19s5--=72e54*ll0lodl-f338868d2";
-		final UrlQuery q = new UrlQuery();
+		final UrlQuery q = UrlQuery.of();
 		final UrlQuery parse = q.parse(requestUrl, Charset.defaultCharset());
 		Assertions.assertEquals("=d52i5837i4ed=o39-ap9e19s5--=72e54*ll0lodl-f338868d2", parse.toString());
 	}
 
 	@Test
-	public void parseTest3(){
+	public void parseTest3() {
 		// issue#1688@Github
 		final String u = "https://www.baidu.com/proxy";
 		final UrlQuery query = UrlQuery.of(URLUtil.url(u).getQuery(), Charset.defaultCharset());
@@ -51,7 +51,7 @@ public class UrlQueryTest {
 	}
 
 	@Test
-	public void parseTest4(){
+	public void parseTest4() {
 		// https://github.com/dromara/hutool/issues/1989
 		final String queryStr = "imageMogr2/thumbnail/x800/format/jpg";
 		final UrlQuery query = UrlQuery.of(queryStr, CharsetUtil.UTF_8);
@@ -110,38 +110,49 @@ public class UrlQueryTest {
 	}
 
 	@Test
-	public void plusTest(){
+	public void plusTest() {
 		// 根据RFC3986，在URL中，+是安全字符，即此符号不转义
 		final String a = UrlQuery.of(MapUtil.of("a+b", "1+2")).build(CharsetUtil.UTF_8);
 		Assertions.assertEquals("a+b=1+2", a);
 	}
 
 	@Test
-	public void parsePlusTest(){
+	public void parsePlusTest() {
 		// 根据RFC3986，在URL中，+是安全字符，即此符号不转义
 		final String a = UrlQuery.of("a+b=1+2", CharsetUtil.UTF_8)
-				.build(CharsetUtil.UTF_8);
+			.build(CharsetUtil.UTF_8);
 		Assertions.assertEquals("a+b=1+2", a);
 	}
 
 	@Test
-	public void spaceTest(){
+	public void spaceTest() {
 		// 根据RFC3986，在URL中，空格编码为"%20"
 		final String a = UrlQuery.of(MapUtil.of("a ", " ")).build(CharsetUtil.UTF_8);
 		Assertions.assertEquals("a%20=%20", a);
 	}
 
 	@Test
-	public void parsePercentTest(){
+	public void parsePercentTest() {
 		final String queryStr = "a%2B=ccc";
 		final UrlQuery query = UrlQuery.of(queryStr, null);
 		Assertions.assertEquals(queryStr, query.toString());
 	}
 
 	@Test
-	public void parsePercentTest2(){
+	public void parsePercentTest2() {
 		final String queryStr = "signature=%2Br1ekUCGjXiu50Y%2Bk0MO4ovulK8%3D";
 		final UrlQuery query = UrlQuery.of(queryStr, null);
 		Assertions.assertEquals(queryStr, query.toString());
 	}
+
+	@Test
+	void issueI78PB1Test() {
+		// 严格模式
+		final UrlQuery query = UrlQuery.of(false, true);
+		query.add(":/?#[]@!$&'()*+,;= ", ":/?#[]@!$&'()*+,;= ");
+
+		final String string = query.build(CharsetUtil.UTF_8);
+		Assertions.assertEquals("%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%20=" +
+			"%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%20", string);
+	}
 }