diff --git a/pom.xml b/pom.xml index 4737083b..376e1e99 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 2011 - 7.4.0 + 7.6.0 1.8 ${project.basedir}/src/main/assemblies/plugin.xml analysis-ik diff --git a/src/main/java/org/wltea/analyzer/dic/Dictionary.java b/src/main/java/org/wltea/analyzer/dic/Dictionary.java index 2e72ed02..624bb07e 100644 --- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java +++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java @@ -51,6 +51,7 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; import org.elasticsearch.SpecialPermission; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.plugin.analysis.ik.AnalysisIkPlugin; @@ -468,18 +469,13 @@ private static List getRemoteWordsUnprivileged(String location) { charset = typeValue.substring(typeValue.lastIndexOf("=") + 1); } } - - if (entity.getContentLength() > 0 || entity.isChunked()) { - in = new BufferedReader(new InputStreamReader(entity.getContent(), charset)); - String line; - while ((line = in.readLine()) != null) { - buffer.add(line); - } - in.close(); - response.close(); - return buffer; + String string = EntityUtils.toString(entity, charset); + if(string != null){ + List words = Arrays.asList(string.split("\n|\r\n")); + buffer.addAll(words); + logger.info("add {} remote stopwords from {}", words.size(), location); } - } + } } response.close(); } catch (IllegalStateException | IOException e) {