update jiguang-common version to 1.2.3.

Author: zhanq

pom.xml

@@ -51,7 +51,7 @@
 		<dependency>
             <groupId>cn.jpush.api</groupId>
             <artifactId>jiguang-common</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.3</version>
         </dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>

src/test/java/cn/jpush/api/files/FileClient2.java

@@ -0,0 +1,92 @@
+package cn.jpush.api.files;
+
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.connection.HttpProxy;
+import cn.jiguang.common.connection.IHttpClient;
+import cn.jiguang.common.connection.NativeHttpClient;
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import cn.jiguang.common.resp.ResponseWrapper;
+import cn.jiguang.common.utils.Preconditions;
+import cn.jiguang.common.utils.StringUtils;
+import cn.jpush.api.file.model.FileModel;
+import cn.jpush.api.file.model.FileModelPage;
+import cn.jpush.api.file.model.FileType;
+import cn.jpush.api.file.model.FileUploadResult;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author daixuan
+ * @version 2020/2/23 19:38
+ */
+public class FileClient2 {
+
+    protected static final Logger LOG = LoggerFactory.getLogger(FileClient2.class);
+
+    private IHttpClient _httpClient;
+    private String _baseUrl;
+    private String _filesPath;
+    private Gson _gson = new Gson();
+
+    public FileClient2(String masterSecret, String appKey) {
+        this(masterSecret, appKey, null, ClientConfig.getInstance());
+    }
+
+    public FileClient2(String masterSecret, String appKey, HttpProxy proxy, ClientConfig conf) {
+        _baseUrl = (String) conf.get(ClientConfig.PUSH_HOST_NAME);
+        _filesPath = (String) conf.get(ClientConfig.V3_FILES_PATH);
+        String authCode = ServiceHelper.getBasicAuthorization(appKey, masterSecret);
+        this._httpClient = new NativeHttpClient(authCode, proxy, conf);
+    }
+
+    public String 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);
+        Map<String, String> textMap = new HashMap<String,String>();
+        textMap.put("ttl",String.valueOf(ttl));
+        String response = client.formUploadByPost(url, textMap, fileMap, null);
+        LOG.info("uploadFile:{}", response);
+        return response;
+    }
+
+    public String uploadFile(FileType type, String filename) throws APIConnectionException, APIRequestException {
+        return uploadFile(type,filename,720);
+    }
+
+    public String queryEffectFiles() throws APIConnectionException, APIRequestException {
+        String url = _baseUrl + _filesPath + "/";
+        ResponseWrapper response = _httpClient.sendGet(url);
+        LOG.info("queryEffFiles:{}", response);
+        return response.responseContent;
+    }
+
+    public String queryFile(String fileId) throws APIConnectionException, APIRequestException {
+        Preconditions.checkArgument(StringUtils.isNotEmpty(fileId), "fileId should not be null");
+        String url = _baseUrl + _filesPath + "/" + fileId;
+        ResponseWrapper response = _httpClient.sendGet(url);
+        LOG.info("queryFile:{}", response);
+        return response.responseContent;
+    }
+
+    public ResponseWrapper deleteFile(String fileId) throws APIConnectionException, APIRequestException {
+        Preconditions.checkArgument(StringUtils.isNotEmpty(fileId), "fileId should not be null");
+        String url = _baseUrl + _filesPath + "/" + fileId;
+        ResponseWrapper response = _httpClient.sendDelete(url);
+        LOG.info("deleteFile:{}", response);
+        return response;
+    }
+}

src/test/java/cn/jpush/api/files/FileClientTest.java

@@ -79,6 +79,8 @@ public void testQueryFile() {
     @Test
     public void testDeleteFile() {
         FileClient fileClient = new FileClient(MASTER_SECRET, APP_KEY);
+
+
         try {
             fileClient.deleteFile(fileId);
         } catch (APIConnectionException e) {
@@ -91,4 +93,8 @@ public void testDeleteFile() {
             LOG.info("Msg ID: " + e.getMsgId());
         }
     }
+
+
+
+
 }