Merge pull request #290 from NigelWu95/dev

add prefetch in Makefile and fix CommonParams's savePath when interac…

Author: 吴炳亨

Makefile

@@ -1,4 +1,4 @@
-version=8.3.12
+version=8.3.13
 
 package_no_test:
 	mvn package -Dmaven.test.skip=true
@@ -8,6 +8,8 @@ deploy_no_test:
 
 release_jar_to_devtools:
 	qsuits -s -path=target/qsuits-$(version)-jar-with-dependencies.jar -process=qupload -a=devtools -bucket=devtools -keep-path=false
+	qsuits -s -url=http://devtools.qiniu.com/qsuits-$(version)-jar-with-dependencies.jar -process=cdnprefetch -a=devtools
+	qsuits -s -url=https://devtools.qiniu.com/qsuits-$(version)-jar-with-dependencies.jar -process=cdnprefetch -a=devtools
 
 clean_logs:
 	rm -rf logs*

docs/interactive.md

@@ -110,7 +110,7 @@ please input line data to process:
 
 ##### 14 对设置了镜像源的空间资源进行镜像更新 [mirror](mirror.md)  
 ```
-➜ ~ qsuits -i -d -process=mirror -bucket=temp
+➜ ~ qsuits -i -d -process=mirror -to-bucket=temp
 please input line data to process: 
 10.mp4
 https://iovip.qbox.me/prefetch/dGVtcDoxMC5tcDQ=	{ResponseInfo:com.qiniu.http.Response@453da22c,status:478, reqId:Zd8AAAATETyxqqQV, xlog:X-Log, xvia:, adress:iovip.qbox.me/115.231.100.199:443, duration:0.000000 s, error:httpGet url failed: E502}  	{"error":"httpGet url failed: E502"}
@@ -201,3 +201,13 @@ please input line data to process:
 test.py
 test.py	200
 ```  
+##### 25 CDN 预取和刷新 [cdn](cdn.md)
+```
+➜ ~ qsuits -d -i -process=cdnprefetch -url-index=0
+http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar
+http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar	{"code":200,"error":"success","requestId":"5e0f983e43d72330d2ac4066","taskIds":{"http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar":"5e0f983e43d72330d2ac4067"},"invalidUrls":null,"quotaDay":100,"surplusDay":88}
+➜ ~ qsuits -d -i -process=cdnrefresh -url-index=0
+http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar
+http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar	{"code":200,"error":"success","requestId":"5e0f987fae4f8427daac2612","taskIds":{"http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar":"5e0f987fae4f8427daac2613"},"invalidUrls":null,"invalidDirs":null,"urlQuotaDay":100,"urlSurplusDay":88,"dirQuotaDay":100,"dirSurplusDay":100}
+```  
+

docs/single.md

@@ -55,7 +55,7 @@ process 提供的参数用法，具体可参见 process 的文档）包括要处
 ```
 ##### 9 对设置了镜像源的空间资源进行镜像更新 [mirror](mirror.md)  
 ```
-➜ ~ qsuits -s -d -process=mirror -bucket=temp -key=10.mp4
+➜ ~ qsuits -s -d -process=mirror -to-bucket=temp -key=10.mp4
 Exception in thread "main" com.qiniu.common.QiniuException: https://iovip.qbox.me/prefetch/dGVtcDoxMC5tcDQ=  
 {ResponseInfo:com.qiniu.http.Response@365c30cc,status:478, reqId:vewAAAAqlUx1-qQV, xlog:X-Log, xvia:, adress:iovip.qbox.me/218.98.28.24:443, duration:0.000000 s, error:httpGet url failed: E502}  
 {"error":"httpGet url failed: E502"}
@@ -159,3 +159,10 @@ test.py	200
 ➜ ~ qsuits -d -s -process=metadata -bucket=temp -key=test.py -meta.Cache-Control="public, max-age=3600"
 test.py	200
 ```  
+##### 25 CDN 预取和刷新 [cdn](cdn.md)
+```
+➜ ~ qsuits -d -s -url=http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar -process=cdnprefetch
+http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar	{"code":200,"error":"success","requestId":"5e0f9363d308f632d9ac7cd2","taskIds":{"http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar":"5e0f9363d308f632d9ac7cd3"},"invalidUrls":null,"quotaDay":100,"surplusDay":89}
+➜ ~ qsuits -d -s -url=http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar -process=cdnrefresh
+http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar	{"code":200,"error":"success","requestId":"5e0f94ba43d72330d2ac2d64","taskIds":{"http://devtools.qiniu.com/qsuits-8.3.12-jar-with-dependencies.jar":"5e0f94ba43d72330d2ac2d65"},"invalidUrls":null,"invalidDirs":null,"urlQuotaDay":100,"urlSurplusDay":89,"dirQuotaDay":100,"dirSurplusDay":100}
+```  

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.qiniu</groupId>
     <artifactId>qsuits</artifactId>
-    <version>8.3.12</version>
+    <version>8.3.13</version>
     <name>qsuits</name>
     <description>qiniu-suits is a efficient tools for qiniu api implemented by java8.</description>
     <url>https://github.com/NigelWu95/qiniu-suits-java</url>

src/main/java/com/qiniu/entry/CommonParams.java

@@ -1253,7 +1253,7 @@ private void setSavePath() throws IOException {
         savePath = entryParam.getValue("save-path", "").trim();
         if ("".equals(savePath)) {
             savePath = "local".equals(source) ? (path.endsWith(FileUtils.pathSeparator) ?
-                    path.substring(0, path.length() - 1) : path) + "-result" : bucket;
+                    path.substring(0, path.length() - 1) : path) + "-result" : (bucket == null ? "" : bucket);
             savePath = savePath.substring(savePath.lastIndexOf(FileUtils.pathSeparator) + 1);
         } else {
             savePath = FileUtils.convertToRealPath(savePath);

version.properties

@@ -1 +1 @@
-version=8.3.12
+version=8.3.13