恢复超时配置

Author: fantouchxie

src/main/java/com/qcloud/image/ClientConfig.java

@@ -8,11 +8,11 @@ public class ClientConfig {
     // 默认的最大重试次数(发生了socketException时)
     private static final int DEFAULT_MAX_RETRIES = 3;
     // 默认的获取连接的超时时间
-    private static final int DEFAULT_CONNECTION_REQUEST_TIMEOUT = -1;
+    private static final int DEFAULT_CONNECTION_REQUEST_TIMEOUT = 60 * 1000;
     // 默认连接超时, 单位ms
-    private static final int DEFAULT_CONNECTION_TIMEOUT = 5 * 1000;
+    private static final int DEFAULT_CONNECTION_TIMEOUT = 60 * 1000;
     // 默认的SOCKET读取超时时间, 默认毫秒
-    private static final int DEFAULT_SOCKET_TIMEOUT = 5 * 1000;
+    private static final int DEFAULT_SOCKET_TIMEOUT = 60 * 1000;
     // 默认的维护最大HTTP连接数
     private static final int DEFAULT_MAX_CONNECTIONS_COUNT = 100;
     // 默认的user_agent标识

src/main/java/com/qcloud/image/http/DefaultImageHttpClient.java

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author chengwu 封装Http发送请求类
@@ -48,7 +49,11 @@ public DefaultImageHttpClient(ClientConfig config) {
     @Override
     protected String sendGetRequest(HttpRequest httpRequest) throws AbstractImageException {
         mOkHttpClient.setProxy(config.getProxy());
-        
+                
+        mOkHttpClient.setConnectTimeout(config.getConnectionTimeout(), TimeUnit.MILLISECONDS);
+        mOkHttpClient.setReadTimeout(config.getSocketTimeout(), TimeUnit.MILLISECONDS);   
+        mOkHttpClient.setWriteTimeout(config.getSocketTimeout(),TimeUnit.MILLISECONDS);
+
         //url
         HttpUrl.Builder urlBuilder = HttpUrl.parse(httpRequest.getUrl()).newBuilder();
         for (String paramKey : httpRequest.getParams().keySet()) {
@@ -135,6 +140,9 @@ public void shutdown() {
     @Override
     protected String sendPostRequest(HttpRequest httpRequest) throws AbstractImageException {
         mOkHttpClient.setProxy(config.getProxy());
+        mOkHttpClient.setConnectTimeout(config.getConnectionTimeout(), TimeUnit.MILLISECONDS);
+        mOkHttpClient.setReadTimeout(config.getSocketTimeout(), TimeUnit.MILLISECONDS);
+        mOkHttpClient.setWriteTimeout(config.getSocketTimeout(),TimeUnit.MILLISECONDS);
 
         if (httpRequest.getContentType() == HttpContentType.APPLICATION_JSON) {
             Map<String, Object> params = httpRequest.getParams();

src/main/java/com/qcloud/image/op/DetectionOp.java

@@ -218,7 +218,7 @@ public String namecardDetect(NamecardDetectRequest request) throws AbstractImage
         return httpClient.sendHttpRequest(httpRequest);
     }
      /**
-     * 名片识别请求
+     * 通用OCR
      * 
      * @param request 标签识别请求参数
      * @return JSON格式的字符串, 格式为{"code":$code, "message":"$mess"}, code为0表示成功, 其他为失败,