From e4a978e3c79f7fd2aa8b229983dc4abfccc37300 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 6 Nov 2024 11:40:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E3=80=91=E4=B8=8A=E4=BC=A0excel=E6=8F=90=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA:=20?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E6=94=AF=E6=8C=81=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/datasource/provider/MysqlEngineProvider.java | 4 ++-- .../io/dataease/datasource/server/DatasourceServer.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) 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 3dddaee3c7..7b2730ad9c 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("varchar(2048)").append(",`"); + Column_Fields.append("varchar(1024)").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("varchar(2048)").append(",`"); + Column_Fields.append("varchar(1024)").append(",`"); break; } } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index a94d55fe6f..0ef13aea07 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -267,7 +267,11 @@ public class DatasourceServer implements DatasourceApi { try { datasourceSyncManage.createEngineTable(datasourceRequest.getTable(), tableFields); } catch (Exception e) { - DEException.throwException("Failed to create table " + datasourceRequest.getTable() + ", " + e.getMessage()); + if (e.getMessage().toLowerCase().contains("Row size too large".toLowerCase())) { + DEException.throwException("文本内容超出最大支持范围： " + datasourceRequest.getTable() + ", " + e.getMessage()); + } else { + DEException.throwException("Failed to create table " + datasourceRequest.getTable() + ", " + e.getMessage()); + } } } commonThreadPool.addTask(() -> { From 3d470890f6f3b0b44b8c09440c52f56fa0ccfa23 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 6 Nov 2024 12:30:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?Elasticsearch=E6=95=B0=E6=8D=AE=E6=BA=90=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=88=90=E5=8A=9F=EF=BC=8C=E4=BD=86checkrequest?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/server/DatasourceServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 0ef13aea07..7579a284e1 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -126,7 +126,7 @@ public class DatasourceServer implements DatasourceApi { } public boolean checkRepeat(@RequestBody BusiDsRequest dataSourceDTO) { - if (Arrays.asList("API", "Excel", "folder").contains(dataSourceDTO.getType())) { + if (Arrays.asList("API", "Excel", "folder", "es").contains(dataSourceDTO.getType())) { return false; } BusiNodeRequest request = new BusiNodeRequest();