Merge pull request #481 from qiniu/update_urlutil

sxci · web-flow · commit 949ec33f1d18 · 2020-06-18T12:22:28.000+08:00
url util default charset utf8 [ci skip]
diff --git a/src/main/java/com/qiniu/util/UrlUtils.java b/src/main/java/com/qiniu/util/UrlUtils.java
@@ -101,6 +101,9 @@ private static String urlEncode(String s, Charset charset, BitSet dontNeedEncodi
             throw new UnsupportedEncodingException(enc);
         }
         */
+        if (charset == null) {
+            charset = Charset.forName("UTF-8");
+        }
 
         for (int i = 0; i < s.length(); ) {
             int c = (int) s.charAt(i);

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ private static String urlEncode(String s, Charset charset, BitSet dontNeedEncodi`
`101`	`101`	`throw new UnsupportedEncodingException(enc);`
`102`	`102`	`}`
`103`	`103`	`*/`
	`104`	`+ if (charset == null) {`
	`105`	`+ charset = Charset.forName("UTF-8");`
	`106`	`+ }`
`104`	`107`
`105`	`108`	`for (int i = 0; i < s.length(); ) {`
`106`	`109`	`int c = (int) s.charAt(i);`