From b04539af658170a8772d8feaca40dfb15a1e7bbd Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 2 Jan 2020 15:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86=E9=9D=9EFi?= =?UTF-8?q?neKit=E7=B1=BB=E7=9A=84=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../es/fun/category/script/client/impl/NashornClient.java | 4 ++-- src/main/java/com/fr/plugin/db/es/fun/help/RenderUtils.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/fr/plugin/db/es/fun/category/script/client/impl/NashornClient.java b/src/main/java/com/fr/plugin/db/es/fun/category/script/client/impl/NashornClient.java index 2f6a8b1..857b28d 100644 --- a/src/main/java/com/fr/plugin/db/es/fun/category/script/client/impl/NashornClient.java +++ b/src/main/java/com/fr/plugin/db/es/fun/category/script/client/impl/NashornClient.java @@ -1,7 +1,7 @@ package com.fr.plugin.db.es.fun.category.script.client.impl; +import com.fanruan.api.log.LogKit; import com.fr.base.TableData; -import com.fr.log.FineLoggerFactory; import com.fr.plugin.db.es.fun.assist.SimpleDataModel; import com.fr.plugin.db.es.fun.category.script.client.NashornFiles; import com.fr.plugin.db.es.fun.category.script.client.ScriptClient; @@ -79,7 +79,7 @@ public class NashornClient implements ScriptClient { } return new SimpleDataModel(columnNames, data, realCount); } catch (ScriptException e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); + LogKit.error(e.getMessage(), e); } return null; } diff --git a/src/main/java/com/fr/plugin/db/es/fun/help/RenderUtils.java b/src/main/java/com/fr/plugin/db/es/fun/help/RenderUtils.java index dd9856b..adc5234 100644 --- a/src/main/java/com/fr/plugin/db/es/fun/help/RenderUtils.java +++ b/src/main/java/com/fr/plugin/db/es/fun/help/RenderUtils.java @@ -1,9 +1,7 @@ package com.fr.plugin.db.es.fun.help; +import com.fanruan.api.util.ArrayKit; import com.fanruan.api.util.RenderKit; -import com.fr.base.Parameter; -import com.fr.base.TemplateUtils; -import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; import java.util.HashMap; @@ -17,7 +15,7 @@ import java.util.Map; public class RenderUtils { public static String calculateQuery(String query, ParameterProvider[] ps) { - if (ArrayUtils.isEmpty(ps)) { + if (ArrayKit.isEmpty(ps)) { return query; } Map map = new HashMap<>();