From 4e6df31222250b7df813aaf80ef1a27a7daa6a9d Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 14 Jan 2021 16:00:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E7=BB=84=E6=97=A0=E6=B3=95=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.xml | 3 ++- .../java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin.xml b/plugin.xml index f047e1f..0ddfc10 100644 --- a/plugin.xml +++ b/plugin.xml @@ -3,12 +3,13 @@ com.fr.plugin.db.es.v10 yes - 2.0.1 + 2.0.2 10.0 2019-10-25 fanruan.richie [2020-11-04]修复取消预览时连接没有被关闭的问。
[2020-11-03]支持通过https协议连接服务器。
[2020-09-09]查询语句中可以使用函数拼接。
diff --git a/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java b/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java index 331068c..fb596c6 100644 --- a/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java +++ b/src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java @@ -14,7 +14,6 @@ import com.fr.config.holder.Conf; import com.fr.data.impl.Connection; import com.fr.general.data.DataModel; import com.fr.intelli.record.Focus; -import com.fr.log.FineLoggerFactory; import com.fr.plugin.db.es.fun.help.RenderUtils; import com.fr.plugin.db.es.fun.query.QueryBuilder; import com.fr.plugin.db.es.fun.type.ConverterType; @@ -31,8 +30,8 @@ import com.fr.third.fasterxml.jackson.annotation.JsonInclude; import com.fr.third.fasterxml.jackson.databind.JsonNode; import com.fr.third.fasterxml.jackson.databind.ObjectMapper; import com.fr.third.fasterxml.jackson.databind.SerializationFeature; +import com.fr.third.guava.collect.Lists; -import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; @@ -143,7 +142,7 @@ public class ElasticsearchTableData extends BaseTableData { ElasticsearchConnection connection = getConnection(); Collection parameterCollection = this.parameters.get(); if (parameterCollection.isEmpty()) { - this.parameters.set(Arrays.asList(ParameterKit.analyze4Parameters(query.get(), false))); + this.parameters.set(Lists.newArrayList(ParameterKit.analyze4Parameters(query.get(), false))); } ParameterProvider[] parameterProviders = processParameters(calculator); ParameterProvider[] ps = Calculator.processParameters(calculator, parameterProviders);