Merge pull request xingePush#24 from xingePush/19

caofangkun · web-flow · commit 27c64dbfb760 · 2018-10-09T17:53:55.000+08:00
xingePush#19 https 域名访问偶发错误
diff --git a/src/main/java/com/tencent/xinge/XingeApp.java b/src/main/java/com/tencent/xinge/XingeApp.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Charsets;
 import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -81,7 +82,7 @@ public JSONObject deviceTag(String jsonRequest) {
         return callRestful(RESTAPI_V3.RESTAPI_TAG, jsonRequest);
     }
 
-    private JSONObject callRestful(String apiAddress, String jsonRequestString) {
+    private synchronized JSONObject callRestful(String apiAddress, String jsonRequestString) {
 
         URL url;
         HttpsURLConnection https = null;
@@ -97,15 +98,22 @@ private JSONObject callRestful(String apiAddress, String jsonRequestString) {
             https.setHostnameVerifier(new TrustAnyHostnameVerifier());
             https.setRequestMethod(RESTAPI_V3.HTTP_POST);
             https.setDoOutput(true);
+            https.setDoInput(true);
+            https.setUseCaches(false);
+            https.setConnectTimeout(10000);
+            https.setReadTimeout(10000);
+            https.setRequestProperty("Content-Type", "application/json");
             https.setRequestProperty("Authorization", "Basic " + authStringEnc);
+            https.setRequestProperty("Connection", "Keep-Alive ");
 
-            byte[] out = jsonRequestString.getBytes(Charsets.UTF_8);
+
+          byte[] out = jsonRequestString.getBytes(Charsets.UTF_8);
             int length = out.length;
 
             https.setFixedLengthStreamingMode(length);
-            https.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
 
             https.connect();
+
             try {
                 DataOutputStream os = new DataOutputStream(https.getOutputStream());
                 os.write(out);
@@ -118,7 +126,16 @@ private JSONObject callRestful(String apiAddress, String jsonRequestString) {
 
             https.getOutputStream().flush();
             https.getOutputStream().close();
-            isr = new InputStreamReader(https.getInputStream());
+
+            InputStream in = null;
+            if (https.getResponseCode() >= 400) {
+              in = https.getErrorStream();
+            } else {
+              in = https.getInputStream();
+            }
+            isr = new InputStreamReader(in);
+
+            isr = new InputStreamReader(in);
             br = new BufferedReader(isr);
             while ((temp = br.readLine()) != null) {
                 ret += temp;
diff --git a/src/test/java/com/tencent/xinge/BaseXgTest.java b/src/test/java/com/tencent/xinge/BaseXgTest.java
@@ -7,7 +7,7 @@ public class BaseXgTest {
     public XingeApp xingeAndroid = null;
     public XingeApp xingeIOS = null;
     private String appIdAndroid = "d617a675b62d0";
-    private String secretKeyAndroid = "9e05364c6d56da943783e61da091e8e5";
+    private String secretKeyAndroid = "b5da4c1faf95ee9409cd33792b02f5d2";
     private String appIdIOS = "f248587cdc955";
     private String secretKeyIOS = "c6bdff7314d4367c18bacc4d30c95dcf";
 
diff --git a/src/test/java/com/tencent/xinge/push/app/PushSingleAccountAndroidTest.java b/src/test/java/com/tencent/xinge/push/app/PushSingleAccountAndroidTest.java
@@ -2,14 +2,15 @@
 
 import com.tencent.xinge.BaseXgTest;
 import com.tencent.xinge.bean.*;
+import com.tencent.xinge.XingeApp;
 import com.tencent.xinge.push.app.PushAppRequest;
 import org.junit.Test;
 
 import java.util.ArrayList;
 
 public class PushSingleAccountAndroidTest extends BaseXgTest {
-
-
+           private String appIdAndroid = "d617a675b62d0";
+            private String secretKeyAndroid = "b5da4c1faf95ee9409cd33792b02f5d2";
     @Test
     public void testPushSingleAccountAndroid() {
 
@@ -45,7 +46,7 @@ public void testPushSingleAccountAndroid() {
         pushAppRequest.setAudience_type(AudienceType.account);
         pushAppRequest.setSeq(123);
         pushAppRequest.setPush_id("0");
-        pushAppRequest.setSend_time("1111111");
+        pushAppRequest.setSend_time("2018-10-09 17:24:20");
         pushAppRequest.setStat_tag("test");
         pushAppRequest.setMessage(message);
 
@@ -54,7 +55,14 @@ public void testPushSingleAccountAndroid() {
         pushAppRequest.setAccount_list(accountList);
 
         System.out.println(pushAppRequest.toString());
-        System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));
+        for (int i=0; i< 5; i++) {
+//          try {
+//            Thread.sleep(5000);
+//          } catch (Exception e) {
+//            
+//          }
+            System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));
+        }
 
     }
 }
diff --git a/src/test/java/com/tencent/xinge/push/app/PushTagAndroidTest.java b/src/test/java/com/tencent/xinge/push/app/PushTagAndroidTest.java
@@ -52,7 +52,12 @@ public void testPushTagAndroid() {
 
 
         System.out.println(pushAppRequest.toString());
-        System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));
+        for (int i=0; i< 3; i++) {
+            System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));
+
+        }
+
+
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,12 @@ public void testPushTagAndroid() {`
`52`	`52`
`53`	`53`
`54`	`54`	`System.out.println(pushAppRequest.toString());`
`55`		`- System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));`
	`55`	`+ for (int i=0; i< 3; i++) {`
	`56`	`+ System.out.println(xingeAndroid.pushApp(pushAppRequest.toString()));`
	`57`	`+`
	`58`	`+ }`
	`59`	`+`
	`60`	`+`
`56`	`61`
`57`	`62`	`}`
`58`	`63`	`}`