zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复HttpUtil.urlWithFormUrlEncoded方法重复编码问题

Browse Source
This commit is contained in:
Looly
2024-04-08 17:31:25 +08:00
parent 983eccf3e6
commit 9a6ac21798
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.StreamProgress;
import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.net.RFC3986;
import cn.hutool.core.net.url.UrlQuery;
@@ -693,7 +694,8 @@ public class HttpUtil {
* @return 合成后的URL
*/
public static String urlWithFormUrlEncoded(String url, Map<String, Object> form, Charset charset) {
return urlWithForm(url, toParams(form, charset, true), charset, true);
// issue#3536，urlWithForm会对参数进行一次编码，因此toParams无需编码
return urlWithForm(url, toParams(form, null, false), charset, true);
}
/**

32
hutool-http/src/test/java/cn/hutool/http/Issue3536Test.java Normal file
View File

@@ -0,0 +1,32 @@
package cn.hutool.http;
import cn.hutool.core.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
public class Issue3536Test {
@Test
public void urlWithFormUrlEncodedTest() {
String url = "https://hutool.cn/test";
final Map<String, Object> paramMap = new HashMap<>();
paramMap.put("redirect_uri", "https://api.hutool.cn/v1/test");
paramMap.put("scope", "a,b,c你");
final String s = HttpUtil.urlWithFormUrlEncoded(url, paramMap, CharsetUtil.CHARSET_UTF_8);
Assert.assertEquals("https://hutool.cn/test?scope=a,b,c%E4%BD%A0&redirect_uri=https://api.hutool.cn/v1/test", s);
}
@Test
public void toParamsTest() {
final Map<String, Object> paramMap = new HashMap<>();
paramMap.put("redirect_uri", "https://api.hutool.cn/v1/test");
paramMap.put("scope", "a,b,c你");
final String params = HttpUtil.toParams(paramMap, CharsetUtil.CHARSET_UTF_8, true);
Assert.assertEquals("scope=a%2Cb%2Cc%E4%BD%A0&redirect_uri=https%3A%2F%2Fapi.hutool.cn%2Fv1%2Ftest", params);
}
}