Merge pull request #195 from jpush/feature/20220124_TS-7022

TS-7022 上传文件接口新增ttl字段，PC-5108 修复新生成JPushClinet会默认访问公有云的问题

Author: Curacao-1

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);

src/main/java/cn/jpush/api/push/PushClient.java

@@ -57,6 +57,10 @@ public PushClient(String masterSecret, String appKey) {
         this(masterSecret, appKey, null, ClientConfig.getInstance());
     }
 
+    public PushClient(String masterSecret, String appKey,ClientConfig clientConfig){
+        this(masterSecret,appKey,null,clientConfig);
+    }
+
     /**
      * This will be removed in the future. Please use ClientConfig{jiguang-common cn.jiguang.common.ClientConfig} instead of this constructor.
      *

src/main/java/cn/jpush/api/schedule/ScheduleClient.java

@@ -23,6 +23,8 @@ public class ScheduleClient {
     private String hostName;
     private String schedulePath;
 
+    private PushClient pushClient;
+
     // If not present, true by default.
     private int apnsProduction;
 
@@ -81,6 +83,8 @@ public ScheduleClient(String masterSecret, String appKey, HttpProxy proxy, Clien
         schedulePath = (String) conf.get(ClientConfig.SCHEDULE_PATH);
         apnsProduction = (Integer) conf.get(ClientConfig.APNS_PRODUCTION);
         timeToLive = (Long) conf.get(ClientConfig.TIME_TO_LIVE);
+        //createSchedule接口需要用到这个类
+        pushClient = new PushClient(masterSecret, appKey, conf);
 
         String authCode = ServiceHelper.getBasicAuthorization(appKey, masterSecret);
         this._httpClient = new NativeHttpClient(authCode, proxy, conf);
@@ -104,7 +108,6 @@ public ScheduleResult createSchedule(SchedulePayload payload, String masterSecre
         // 调用getCidList方法来获取cid并赋值到payload中
         String cid = payload.getCid();
         if (cid == null) {
-            PushClient pushClient = new PushClient(masterSecret, appKey);
             CIDResult cidResult = pushClient.getCidList(1 , "schedule");
             payload.setCid(cidResult.cidlist.get(0));
         }

src/test/java/cn/jpush/api/schedule/ScheduleClientTest.java

@@ -60,10 +60,12 @@ public void testGetScheduleList() {
      * Method: deleteSchedule(String scheduleId)
      */
     @Test
-    public void testScheduleMethods(String masterSecret, String appKey) {
+    public void testScheduleMethods() {
+        String masterSecret = MASTER_SECRET;
+        String appKey = APP_KEY;
         String name = "test_schedule";
         TriggerPayload trigger = TriggerPayload.newBuilder()
-                .setSingleTime("2105-07-30 12:00:00")
+                .setSingleTime("2022-07-30 12:00:00")
                 .buildSingle();
 
         PushPayload push = PushPayload.alertAll("test schedule");