diff --git a/plugin.xml b/plugin.xml index 0ddfc10..90d817b 100644 --- a/plugin.xml +++ b/plugin.xml @@ -3,12 +3,13 @@ com.fr.plugin.db.es.v10 yes - 2.0.2 + 2.0.3 10.0 2019-10-25 fanruan.richie [2021-01-14]修改链表的生成方式,解决配置无法被克隆的问题。
[2020-11-04]修复取消预览时连接没有被关闭的问。
[2020-11-03]支持通过https协议连接服务器。
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 fb596c6..089a302 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 @@ -279,6 +279,7 @@ public class ElasticsearchTableData extends BaseTableData { cloned.query = (Conf) query.clone(); cloned.queryType = (Conf) queryType.clone(); cloned.script = (Conf) script.clone(); + cloned.configAttribute = (Conf) configAttribute.clone(); return cloned; } @@ -293,11 +294,12 @@ public class ElasticsearchTableData extends BaseTableData { && AssistKit.equals(paraType, ((ElasticsearchTableData) obj).paraType) && AssistKit.equals(query, ((ElasticsearchTableData) obj).query) - && AssistKit.equals(script, ((ElasticsearchTableData) obj).script); + && AssistKit.equals(script, ((ElasticsearchTableData) obj).script) + && AssistKit.equals(configAttribute, ((ElasticsearchTableData) obj).configAttribute); } @Override public int hashCode() { - return AssistKit.hashCode(database.get(), endPoint.get(), converterType.get(), paraType.get(), query.get(), script.get()); + return AssistKit.hashCode(database.get(), endPoint.get(), converterType.get(), paraType.get(), query.get(), script.get(), converterType.hashCode()); } }