上传文件接口新增ttl字段

Author: huanglh

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>cn.jpush.api</groupId>
 	<artifactId>jpush-client</artifactId>
-	<version>3.6.0</version>
+	<version>3.6.1</version>
 	<packaging>jar</packaging>
 	<url>https://github.com/jpush/jpush-api-java-client</url>
 	<name>JPush API Java Client</name>

src/main/java/cn/jpush/api/file/FileClient.java

@@ -46,22 +46,28 @@ public FileClient(String masterSecret, String appKey, HttpProxy proxy, ClientCon
         this._httpClient = new NativeHttpClient(authCode, proxy, conf);
     }
 
-    public FileUploadResult uploadFile(FileType type, String filename)
+    public FileUploadResult uploadFile(FileType type, String filename, Integer ttl)
             throws APIConnectionException, APIRequestException {
         Preconditions.checkArgument(type != null, "type should not be null");
         Preconditions.checkArgument(StringUtils.isNotEmpty(filename), "filename should not be null");
+        Preconditions.checkArgument(ttl >= 1 && ttl <= 720,"TTL is not in the range of 1 to 720");
         NativeHttpClient client = (NativeHttpClient) _httpClient;
         String typeStr = type.value();
         String url = _baseUrl + _filesPath + "/" + typeStr;
         Map<String, String> fileMap = new HashMap<String,String>();
         fileMap.put("filename", filename);
+        fileMap.put("ttl",String.valueOf(ttl));
         String response = client.formUploadByPost(url, null, fileMap, null);
         LOG.info("uploadFile:{}", response);
         return _gson.fromJson(response,
                 new TypeToken<FileUploadResult>() {
                 }.getType());
     }
 
+    public FileUploadResult uploadFile(FileType type, String filename) throws APIConnectionException, APIRequestException {
+        return uploadFile(type,filename,720);
+    }
+
     public FileModelPage queryEffectFiles() throws APIConnectionException, APIRequestException {
         String url = _baseUrl + _filesPath + "/";
         ResponseWrapper response = _httpClient.sendGet(url);