liuam 7 gadi atpakaļ
vecāks
revīzija
ee1c4156d8

+ 1 - 1
src/main/java/com/uas/ps/inquiry/http/HttpClientSpringFactory.java

@@ -126,7 +126,7 @@ public class HttpClientSpringFactory {
             public boolean retryRequest(IOException exception,
                                         int executionCount, HttpContext context) {
                 logger.info("http request occurs error:{}", exception.getMessage());
-                if (executionCount >= 20000) {// 如果已经重试了3000次,就放弃
+                if (executionCount >= 3000) {// 如果已经重试了3000次,就放弃
                     return false;
                 }
                 if (exception instanceof SSLHandshakeException) {// 不要重试SSL握手异常

+ 24 - 4
src/main/java/com/uas/ps/inquiry/util/HttpUtil.java

@@ -257,6 +257,7 @@ public class HttpUtil {
 	 */
 	public static String doPost(String postUrl, String formData) throws Exception {
 		HttpPost post = null;
+		InputStream in = null;
 		try {
 			CloseableHttpClient httpClient = clientSpringFactory.getHttpSyncClient();
 			post = new HttpPost(postUrl);
@@ -264,12 +265,17 @@ public class HttpUtil {
 			post.setEntity(postingString);
 			post.setHeader("Content-type", "application/json");
 			HttpResponse response = httpClient.execute(post);
-			String content = EntityUtils.toString(response.getEntity());
+			HttpEntity entity = response.getEntity();
+			in = entity.getContent();
+			String content = EntityUtils.toString(entity);
 			return content;
 		} finally {
 			if (post != null) {
 				post.releaseConnection();
 			}
+			if (in != null) {
+				in.close();
+			}
 		}
 
 
@@ -343,13 +349,18 @@ public class HttpUtil {
 	public static Response sendHttpUriRequest(HttpRequestBase request) throws Exception {
 		CloseableHttpClient httpClient = clientSpringFactory.getHttpSyncClient();
 		CloseableHttpResponse response = null;
+        InputStream in = null;
 		try {
 			response = httpClient.execute(request);
-			return Response.getResponse(response);
+            in = response.getEntity().getContent();
+            return Response.getResponse(response);
 		} finally {
 			if (request != null) {
 				request.releaseConnection();
 			}
+			if (in != null) {
+			    in.close();
+            }
 		}
 	}
 
@@ -365,6 +376,7 @@ public class HttpUtil {
 														  Map<String, Object> params, boolean encode) throws Exception {
 		CloseableHttpClient httpClient = clientSpringFactory.getHttpSyncClient();
 		CloseableHttpResponse response = null;
+		InputStream in = null;
 		try {
 			if (!encode) {
 				request.setEntity(new StringEntity(FlexJsonUtils.toJson(params), ContentType.APPLICATION_JSON));
@@ -386,11 +398,15 @@ public class HttpUtil {
 				request.setEntity(new UrlEncodedFormEntity(nvps));
 			}
 			response = httpClient.execute(request);
+			in = response.getEntity().getContent();
 			return Response.getResponse(response);
 		} finally {
 			if (request != null) {
 				request.releaseConnection();
 			}
+            if (in != null) {
+                in.close();
+            }
 		}
 	}
 
@@ -539,6 +555,7 @@ public class HttpUtil {
 		CloseableHttpClient httpClient = clientSpringFactory.getHttpSyncClient();
 		CloseableHttpResponse response = null;
 		HttpPost httpPost = null;
+        InputStream in = null;
 		try {
 
 			httpPost = new HttpPost(postUrl);
@@ -555,11 +572,14 @@ public class HttpUtil {
 			HttpEntity reqEntity = builder.build();
 			httpPost.setEntity(reqEntity);
 			response = httpClient.execute(httpPost);
-		} finally {
+            in = response.getEntity().getContent();
+        } finally {
 			if (httpPost != null) {
 				httpPost.releaseConnection();
 			}
-
+            if (in != null) {
+                in.close();
+            }
 		}
 		return Response.getResponse(response);
 	}

+ 4 - 4
src/main/resources/config/application-cloud.properties

@@ -26,16 +26,16 @@ mall.url = http://10.10.0.10
 message.senderuu=1000010022
 message.senderEnuu=10042875
 
-http.asyncConnectTimeout=30000
+http.asyncConnectTimeout=60000
 http.asyncSocketTimeout=30000
 http.asyncConnectionRequestTimeout=10000
 http.asyncConnectNum=500
-http.asyncConnectPerRoute=10
+http.asyncConnectPerRoute=500
 http.asyncIoThreadCount=500
-http.syncConnectTimeout=60000
+http.syncConnectTimeout=120000
 http.syncSocketTimeout=60000
 http.syncConnectionRequestTimeout=10000
-http.syncConnectPerRoute=10
+http.syncConnectPerRoute=500
 http.syncConnectNum=500
 
 

+ 4 - 4
src/main/resources/config/application-dev.properties

@@ -29,16 +29,16 @@ mall.url = http://192.168.253.12:23400/
 message.senderuu=1000010022
 message.senderEnuu=10043516
 
-http.asyncConnectTimeout=30000
+http.asyncConnectTimeout=60000
 http.asyncSocketTimeout=30000
 http.asyncConnectionRequestTimeout=10000
 http.asyncConnectNum=500
-http.asyncConnectPerRoute=10
+http.asyncConnectPerRoute=500
 http.asyncIoThreadCount=500
-http.syncConnectTimeout=60000
+http.syncConnectTimeout=120000
 http.syncSocketTimeout=60000
 http.syncConnectionRequestTimeout=10000
-http.syncConnectPerRoute=10
+http.syncConnectPerRoute=500
 http.syncConnectNum=500
 
 

+ 4 - 4
src/main/resources/config/application-test.properties

@@ -26,16 +26,16 @@ mall.url = http://192.168.253.12:23400/
 message.senderuu=1000010022
 message.senderEnuu=10043516
 
-http.asyncConnectTimeout=30000
+http.asyncConnectTimeout=60000
 http.asyncSocketTimeout=30000
 http.asyncConnectionRequestTimeout=10000
 http.asyncConnectNum=500
-http.asyncConnectPerRoute=10
+http.asyncConnectPerRoute=500
 http.asyncIoThreadCount=500
-http.syncConnectTimeout=60000
+http.syncConnectTimeout=120000
 http.syncSocketTimeout=60000
 http.syncConnectionRequestTimeout=10000
-http.syncConnectPerRoute=10
+http.syncConnectPerRoute=500
 http.syncConnectNum=500
 
 

+ 4 - 4
src/main/resources/config/application-txcloud.properties

@@ -27,16 +27,16 @@ mall.url = http://172.16.0.100
 message.senderuu=1000010022
 message.senderEnuu=10042875
 
-http.asyncConnectTimeout=30000
+http.asyncConnectTimeout=60000
 http.asyncSocketTimeout=30000
 http.asyncConnectionRequestTimeout=10000
 http.asyncConnectNum=500
-http.asyncConnectPerRoute=10
+http.asyncConnectPerRoute=500
 http.asyncIoThreadCount=500
-http.syncConnectTimeout=60000
+http.syncConnectTimeout=120000
 http.syncSocketTimeout=60000
 http.syncConnectionRequestTimeout=10000
-http.syncConnectPerRoute=10
+http.syncConnectPerRoute=500
 http.syncConnectNum=500