Merge branch 'master' of https://github.com/xingePush/xinge-api-java

bulezeng(曾卫进) · bulezeng(曾卫进) · commit b9d6bbe66a82 · 2018-11-20T18:48:35.000+08:00
diff --git a/src/main/java/com/tencent/xinge/XingeApp.java b/src/main/java/com/tencent/xinge/XingeApp.java
@@ -1,12 +1,7 @@
 package com.tencent.xinge;
 
-import com.google.common.base.Charsets;
 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
+import java.net.Proxy;
 import java.util.concurrent.TimeUnit;
 
 import com.tencent.xinge.push.app.PushAppRequest;
@@ -16,8 +11,6 @@
 
 import com.tencent.xinge.api.RESTAPIV3;
 
-import javax.net.ssl.*;
-
 /**
  * 提供V3接口<br>
  * 1. v3中appId是String类型，v2中是long <br>
@@ -36,10 +29,7 @@ public class XingeApp {
 
     private RESTAPIV3 restapiV3 = new RESTAPIV3();
 
-    private OkHttpClient client = new OkHttpClient.Builder()
-            .connectTimeout(10, TimeUnit.SECONDS)//设置连接超时时间
-            .readTimeout(10, TimeUnit.SECONDS)//设置读取超时时间
-            .build();
+    private OkHttpClient client;
 
     /**
      * HTTP Header Authorization 的值：Basic base64_auth_string<br>
@@ -49,21 +39,40 @@ public class XingeApp {
      * @param appId     appId
      * @param secretKey secretKey
      */
-    public XingeApp(String appId, String secretKey) {
+    private XingeApp(String appId, String secretKey) {
         this.authString = appId + ":" + secretKey;
 
         byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
         authStringEnc = new String(authEncBytes);
+
+        client = new OkHttpClient.Builder()
+                .connectTimeout(10, TimeUnit.SECONDS)//设置连接超时时间
+                .readTimeout(10, TimeUnit.SECONDS)//设置读取超时时间
+                .build();
+    }
+
+    private XingeApp(Builder builder){
+        this.authString = builder.appId + ":" + builder.secretKey;
+
+        byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
+        authStringEnc = new String(authEncBytes);
+
+        client = new OkHttpClient.Builder()
+                .proxy(builder.proxy)
+                .connectTimeout(builder.connectTimeOut, TimeUnit.SECONDS)//设置连接超时时间
+                .readTimeout(builder.readTimeOut, TimeUnit.SECONDS)//设置读取超时时间
+                .build();
     }
 
 
 
     /**
      * @param authStringEnc base64_auth_string
      */
+    /**
     public XingeApp(String authStringEnc) {
         this.authStringEnc = authStringEnc;
-    }
+    }**/
 
     /**
      * 设置信鸽api http 服务器地址
@@ -141,5 +150,53 @@ public static String stringifyError(Throwable error) {
         return result.toString();
     }
 
+    public static class Builder {
+        private String appId;
+        private String secretKey;
+        private Proxy proxy = Proxy.NO_PROXY;
+        private int connectTimeOut;
+        private int readTimeOut;
+
+        public Builder() {
+            proxy = Proxy.NO_PROXY;
+            connectTimeOut = 10;
+            readTimeOut = 10;
+        }
+
+        public Builder appId(String appId) {
+            this.appId = appId;
+            return this;
+        }
+
+        public Builder secretKey(String secretKey) {
+            this.secretKey = secretKey;
+            return this;
+        }
+
+        public Builder proxy(Proxy proxy) {
+            this.proxy = proxy;
+            return this;
+        }
+
+        public Builder connectTimeOut(int connectTimeOut) {
+            this.connectTimeOut = connectTimeOut;
+            return this;
+        }
+
+        public Builder readTimeOut(int readTimeOut) {
+            this.readTimeOut = readTimeOut;
+            return this;
+        }
+
+        public XingeApp build() {
+            if (appId == null || secretKey == null) {
+                throw new IllegalArgumentException("Please set appId and secret key.");
+            }
+
+            return new XingeApp(this);
+        }
+
+    }
+
 
 }
diff --git a/src/test/java/com/tencent/xinge/BaseXgTest.java b/src/test/java/com/tencent/xinge/BaseXgTest.java
@@ -14,7 +14,13 @@ public class BaseXgTest {
 
     @Before
     public void init() {
-        xingeAndroid = new XingeApp(appIdAndroid, secretKeyAndroid);
-        xingeIOS = new XingeApp(appIdIOS, secretKeyIOS);
+        xingeAndroid = new XingeApp.Builder()
+                .appId(appIdAndroid)
+                .secretKey(secretKeyAndroid)
+                .build();
+        xingeIOS = new XingeApp.Builder()
+                .appId(appIdIOS)
+                .secretKey(secretKeyIOS)
+                .build();
     }
 }
