From eef2bb8773f83b87b0b54dfc4743ad78365199f6 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 30 Oct 2024 17:21:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20[=E6=95=B0=E6=8D=AE=E6=BA=90]?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=9B=E5=BB=BA=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=97=B6=EF=BC=8C=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=9A=84=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=A4=E4=B8=AAloading=EF=BC=8C=E9=9C=80=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/config/CommonConfig.java | 2 +- .../io/dataease/datasource/provider/CalciteProvider.java | 5 ++++- .../src/views/visualized/data/datasource/form/index.vue | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/config/CommonConfig.java b/core/core-backend/src/main/java/io/dataease/config/CommonConfig.java index 7ed3a3833d..c3a3107274 100644 --- a/core/core-backend/src/main/java/io/dataease/config/CommonConfig.java +++ b/core/core-backend/src/main/java/io/dataease/config/CommonConfig.java @@ -14,7 +14,7 @@ public class CommonConfig { @Bean(destroyMethod = "shutdown") public CommonThreadPool resourcePoolThreadPool() { CommonThreadPool commonThreadPool = new CommonThreadPool(); - commonThreadPool.setCorePoolSize(20); + commonThreadPool.setCorePoolSize(50); commonThreadPool.setMaxQueueSize(100); commonThreadPool.setKeepAliveSeconds(3600); return commonThreadPool; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index 34aee0fadd..8046f750be 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -1391,11 +1391,14 @@ public class CalciteProvider extends Provider { Connection connection = take(); CalciteConnection calciteConnection = connection.unwrap(CalciteConnection.class); SchemaPlus rootSchema = calciteConnection.getRootSchema(); + if (rootSchema.getSubSchema(String.format(SQLConstants.SCHEMA, dsId)) == null) { + DEException.throwException("请检查数据源的有效性！"); + } JdbcSchema jdbcSchema = rootSchema.getSubSchema(String.format(SQLConstants.SCHEMA, dsId)).unwrap(JdbcSchema.class); BasicDataSource basicDataSource = (BasicDataSource) jdbcSchema.getDataSource(); return basicDataSource.getConnection(); } catch (Exception e) { - DEException.throwException("连接无效"); + DEException.throwException("连接无效, " + e.getMessage()); } return null; } diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue index 70292e1e15..043e9203b0 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue @@ -710,7 +710,7 @@ defineExpose({ -
+
-
+
{{ typeTitle }}
@@ -816,7 +816,7 @@ defineExpose({
-
+
{{ t('common.cancel') }} Date: Wed, 30 Oct 2024 17:27:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=20=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86Doris?= =?UTF-8?q?=E5=85=B3=E8=81=94excel=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/provider/H2EngineProvider.java | 15 +++------------ .../datasource/provider/MysqlEngineProvider.java | 4 ++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java index 9a4d737cba..e3c7a6bdf0 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/H2EngineProvider.java @@ -84,15 +84,10 @@ public class H2EngineProvider extends EngineProvider { int size = tableField.getPrecision() * 4; switch (tableField.getDeType()) { case 0: - Column_Fields.append("longtext").append(",`"); + Column_Fields.append("varchar(2048)").append(",`"); break; case 1: - size = size < 50 ? 50 : size; - if (size < 65533) { - Column_Fields.append("varchar(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); - } else { - Column_Fields.append("longtext").append(",`"); - } + Column_Fields.append("varchar(2048)").append(",`"); break; case 2: Column_Fields.append("bigint(20)").append(",`"); @@ -104,11 +99,7 @@ public class H2EngineProvider extends EngineProvider { Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); break; default: - if (size < 65533) { - Column_Fields.append("varchar(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); - } else { - Column_Fields.append("longtext").append(",`"); - } + Column_Fields.append("varchar(2048)").append(",`"); break; } } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java index e3f454f5d2..3dddaee3c7 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java @@ -89,7 +89,7 @@ public class MysqlEngineProvider extends EngineProvider { int size = tableField.getPrecision() * 4; switch (tableField.getDeExtractType()) { case 0: - Column_Fields.append("longtext").append(",`"); + Column_Fields.append("varchar(2048)").append(",`"); break; case 1: Column_Fields.append("datetime").append(",`"); @@ -104,7 +104,7 @@ public class MysqlEngineProvider extends EngineProvider { Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(tableField.getPrecision()))).append(",`"); break; default: - Column_Fields.append("longtext").append(",`"); + Column_Fields.append("varchar(2048)").append(",`"); break; } }