From 2d454115cfaf35d99751bc4b97a32025730a33e6 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sun, 23 Feb 2025 17:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=9F=90=E4=BA=9Bsql=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84log=E6=97=A5=E5=BF=97=E5=8A=A0?= =?UTF-8?q?=E4=B8=8AsqlParserVO.getSqlLogEnabled()=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LiteFlowAutoLookUpJdbcConn.java | 5 ++- .../parser/sql/util/LiteFlowJdbcUtil.java | 42 ------------------- .../liteflow-script-java/pom.xml | 13 ++++++ 3 files changed, 16 insertions(+), 44 deletions(-) diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/datasource/impl/LiteFlowAutoLookUpJdbcConn.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/datasource/impl/LiteFlowAutoLookUpJdbcConn.java index 7ad67b7fa..34efae60c 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/datasource/impl/LiteFlowAutoLookUpJdbcConn.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/datasource/impl/LiteFlowAutoLookUpJdbcConn.java @@ -68,8 +68,9 @@ public class LiteFlowAutoLookUpJdbcConn implements LiteFlowDataSourceConnect { if (LiteFlowJdbcUtil.checkConnectionCanExecuteSql(dataSource.getConnection(), executeSql)) { // 找到数据源名称后,将其缓存起来,下次使用就不再寻找 LiteFlowJdbcUtil.DataSourceBeanNameHolder.init(dataSourceName); - - LOG.info("use dataSourceName[{}],has found liteflow config", dataSourceName); + if (sqlParserVO.getSqlLogEnabled()) { + LOG.info("use dataSourceName[{}],has found liteflow config", dataSourceName); + } break; } else { LOG.info("check dataSourceName[{}],but not has liteflow config", dataSourceName); diff --git a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java index 3efbfab4a..35cfe13e5 100644 --- a/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java +++ b/liteflow-rule-plugin/liteflow-rule-sql/src/main/java/com/yomahub/liteflow/parser/sql/util/LiteFlowJdbcUtil.java @@ -157,47 +157,5 @@ public class LiteFlowJdbcUtil { public static boolean isNotInit() { return DATA_SOURCE_NAME == null; } - - /** - * 自动查找可用数据源 - */ - public static Connection autoLookUpConn(SQLParserVO sqlParserVO) throws SQLException { - Connection connection; - Map dataSourceMap = ContextAwareHolder.loadContextAware().getBeansOfType(DataSource.class); - if (DataSourceBeanNameHolder.isNotInit()) { - synchronized (DataSourceBeanNameHolder.class) { - if (DataSourceBeanNameHolder.isNotInit()) { - String executeSql = buildCheckSql(sqlParserVO); - // 遍历数据源,多数据源场景下,判断哪个数据源有 liteflow 配置 - for (Map.Entry entry : dataSourceMap.entrySet()) { - String dataSourceName = entry.getKey(); - DataSource dataSource = entry.getValue(); - - if (checkConnectionCanExecuteSql(dataSource.getConnection(), executeSql)) { - // 找到数据源名称后,将其缓存起来,下次使用就不再寻找 - DataSourceBeanNameHolder.init(dataSourceName); - if (sqlParserVO.getSqlLogEnabled()) { - LOG.info("use dataSourceName[{}],has found liteflow config", dataSourceName); - } - break; - } else { - LOG.warn("check dataSourceName[{}],but not has liteflow config", dataSourceName); - } - } - } - } - } - DataSource dataSource = Optional.ofNullable(DataSourceBeanNameHolder.getDataSourceName()) - .map(dataSourceMap::get) - .orElse(null); - if (dataSource == null) { - throw new ELSQLException("can not found liteflow config in dataSourceName " + dataSourceMap.keySet()); - } - connection = dataSource.getConnection(); - if (connection == null) { - throw new ELSQLException("can not found liteflow config in dataSourceName " + dataSourceMap.keySet()); - } - return connection; - } } } diff --git a/liteflow-script-plugin/liteflow-script-java/pom.xml b/liteflow-script-plugin/liteflow-script-java/pom.xml index 7fae85809..826bcab90 100644 --- a/liteflow-script-plugin/liteflow-script-java/pom.xml +++ b/liteflow-script-plugin/liteflow-script-java/pom.xml @@ -27,4 +27,17 @@ janino + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + \ No newline at end of file