commit

DataFusion/src/com/zskk/control/ViewController.java

@@ -30,7 +30,10 @@ public class ViewController extends Controller {
 
 	private static final MediaType JSON_CODE = MediaType.get("application/json; charset=utf-8");
 
-	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
+	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient.Builder()
+			.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
+			.hostnameVerifier(SSLSocketClient.getHostnameVerifier())
+			.build();
 
 	/**
 	 * 在被连接数据库执行sql语句
@@ -69,11 +72,6 @@ public class ViewController extends Controller {
 public static String postWithParameters(String url, Map<String, String> map) {
 
 
-	OkHttpClient client = new OkHttpClient.Builder()
-			.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
-			.hostnameVerifier(SSLSocketClient.getHostnameVerifier())
-			.build();
-
 	   
 	FormBody.Builder formbody = new FormBody.Builder();
 
@@ -87,7 +85,7 @@ public static String postWithParameters(String url, Map<String, String> map) {
 		        .post(requestBody)
 		        .build();
 
-		    try (Response response = client.newCall(request).execute()) {
+		    try (Response response = OKHTTP_CLIENT.newCall(request).execute()) {
 		      if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
 		      String content = response.body().string();
 		      return content;

DataFusion/src/com/zskk/service/DataService.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.PropKit;
+import com.zskk.tools.SSLSocketClient;
 
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
@@ -20,9 +21,11 @@ public class DataService {
     private static String GET_EXAM_URL = "https://117.156.67.61:9600/butt/getExam";
     
     private static String SAVE_REPORT_URL = "https://117.156.67.61:9600/butt/saveReport";
-	
-    private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
-    
+
+	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient.Builder()
+			.sslSocketFactory(SSLSocketClient.getSSLSocketFactory(), SSLSocketClient.getX509TrustManager())
+			.hostnameVerifier(SSLSocketClient.getHostnameVerifier())
+			.build();  
     /**
      * 获取未出报告的检查列表
      * @param instutionId