Merge pull request #576 from bigooio/FUSION-17975

解决 URLEncoder 空格为 + 号问题

Author: carter2000

src/main/java/com/qiniu/cdn/CdnManager.java

@@ -59,9 +59,17 @@ public CdnManager(Auth auth, String server, Client client) {
         this.client = client;
     }
 
+    public static String encodePath(String path) throws Exception {
+        try {
+            return URLEncoder.encode(path, "UTF-8").replaceAll("%2F", "/").replaceAll("\\+", "%20");
+        } catch (Exception e) {
+            throw e;
+        }
+    }
+
     public static String createTimestampAntiLeechUrl(URL oUrl, String encryptKey, long deadline) throws QiniuException {
         try {
-            String urlencodedPath = URLEncoder.encode(oUrl.getPath(), "UTF-8").replaceAll("%2F", "/");
+            String urlencodedPath = encodePath(oUrl.getPath());
             String query = oUrl.getQuery();
             String file = (query == null) ? urlencodedPath : (urlencodedPath + "?" + query);
             URL url = new URL(oUrl.getProtocol(), oUrl.getHost(), oUrl.getPort(), file);

src/test/java/test/com/qiniu/cdn/CdnManagerTest.java

@@ -0,0 +1,38 @@
+package test.com.qiniu.cdn;
+
+import com.qiniu.cdn.CdnManager;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class CdnManagerTest {
+    @Test
+    public void testencodePath() {
+        try {
+            // 空格替换为 %20
+            String path = "/ hello/ world";
+            String got = CdnManager.encodePath(path);
+            String want = "/%20hello/%20world";
+            assertEquals(want, got);
+
+            // 半角 + 号替换为 %2B
+            path = "/+hello/+world";
+            got = CdnManager.encodePath(path);
+            want = "/%2Bhello/%2Bworld";
+
+            assertEquals(want, got);
+
+            // % 号替换为 %25
+            path = "/%hello/+world";
+            got = CdnManager.encodePath(path);
+            want = "/%25hello/%2Bworld";
+            assertEquals(want, got);
+
+
+        } catch (Exception e) {
+            fail(e.toString());
+        }
+    }
+
+}