Merge pull request #32 from Liuchy1/master

modify ssl version

Author: Liuchy1

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>cn.jpush.api</groupId>
 	<artifactId>jpush-client</artifactId>
-	<version>3.2.7-SNAPSHOT</version>
+	<version>3.2.8-SNAPSHOT</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/common/connection/NativeHttpClient.java

@@ -261,7 +261,8 @@ protected void initSSL() {
         TrustManager[] tmCerts = new javax.net.ssl.TrustManager[1];
         tmCerts[0] = new SimpleTrustManager();
 		try {
-            SSLContext sslContext = SSLContext.getInstance("SSL");
+//            SSLContext sslContext = SSLContext.getInstance("SSL");
+			SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
 			sslContext.init(null, tmCerts, null);
 			HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
 

src/test/java/cn/jpush/api/BaseTest.java

@@ -5,7 +5,7 @@
 public abstract class BaseTest {
 
 	protected static final String APP_KEY ="dd1066407b044738b6479275";
-    protected static final String MASTER_SECRET = "6b135be0037a5c1e693c3dfa";
+    protected static final String MASTER_SECRET = "e8cc9a76d5b7a580859bcfa7";
 
     public static final String ALERT = "JPush Test - alert";
     public static final String MSG_CONTENT = "JPush Test - msgContent";