diff --git a/build.gradle b/build.gradle index 686cd6d..7ed1720 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.1.10' + version '1.1.12' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java index 0ff4c64..c406080 100644 --- a/src/main/java/com/taover/util/UtilExcel.java +++ b/src/main/java/com/taover/util/UtilExcel.java @@ -299,6 +299,8 @@ public class UtilExcel { }else if(cell.getCellType() == HSSFCell.CELL_TYPE_FORMULA){ dataRow.add(""+cell.getCellFormula()); //dataRow.add(cell.getNumericCellValue()); + }else if(cell.getCellType() == HSSFCell.CELL_TYPE_ERROR){ + dataRow.add(""+cell.getErrorCellValue()); }else{ dataRow.add(cell.getStringCellValue()); } diff --git a/src/main/java/com/taover/util/UtilHttpByOkHttp.java b/src/main/java/com/taover/util/UtilHttpByOkHttp.java index 6b41fd3..f3941cd 100644 --- a/src/main/java/com/taover/util/UtilHttpByOkHttp.java +++ b/src/main/java/com/taover/util/UtilHttpByOkHttp.java @@ -95,7 +95,7 @@ public class UtilHttpByOkHttp { return getHttpClient(url).newCall(request).execute().body().bytes(); } - private static OkHttpClient getHttpClient(String url){ + public static OkHttpClient getHttpClient(String url){ if(url.trim().toLowerCase().startsWith("https")){ return buildOkHttpClientForHttps(); }else{ @@ -103,6 +103,25 @@ public class UtilHttpByOkHttp { } } + /** + * 并发请求复用连接池,避免内存溢出 + * @param okHttpClient + * @param url + * @param headers + * @param jsonStr + * @return + * @throws Exception + */ + public static String sendPostJson(OkHttpClient okHttpClient,String url, final Map headers, String jsonStr) throws Exception{ + //请求体 + RequestBody requestBody = getReqeustBodyJson(jsonStr); + + //http头信息拼装 + Request request = getRequestBuilder(url, headers).post(requestBody).build(); + + return okHttpClient.newCall(request).execute().body().string(); + } + private static RequestBody getReqeustBody(Map params){ //表单信息拼装 FormBody.Builder builder = new FormBody.Builder(Charset.forName("UTF-8")); -- libgit2 0.21.2