Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ThInspectionServiceImpl.java

@@ -150,7 +150,13 @@ public class ThInspectionServiceImpl extends BaseServiceImpl<ThInspectionMapper,
         jsonObject.put("taskId", thMission.getInspectionLine());
         jsonObject.put("requestId", missionId);
         log.info("***** executeTask url:{};param:{}", url, jsonObject.toJSONString());
-        String airPortStr = HttpUtils.doSend(url, jsonObject, null, "POST");
+        String airPortStr = null;
+        try {
+            airPortStr = HttpUtils.doSend(url, jsonObject, null, "POST");
+        } catch (Exception e) {
+            log.error("调用机场executeTask接口异常：",e);
+            return JsonResult.error("调用机场executeTask接口异常");
+        }
         if(StringUtils.isEmpty(airPortStr)){
             return JsonResult.error("机场接口返回数据为空");
         }

tuoheng-common/src/main/java/com/tuoheng/common/utils/HttpUtils.java

@@ -83,7 +83,7 @@ public class HttpUtils {
             connection.setDoOutput(true); // 设置该连接是可以输出的
             //设置连接超时时间和读取超时时间
             connection.setConnectTimeout(15000);
-            connection.setReadTimeout(60000 * 2);
+            connection.setReadTimeout(60000 * 5);
             //设置请求方式
             connection.setRequestMethod(method);
             connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");