From e4a978e3c79f7fd2aa8b229983dc4abfccc37300 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 6 Nov 2024 11:40:50 +0800
Subject: [PATCH] =?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(() -> {