github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13159 from dataease/pr@dev-v2@fixds

Browse Source 
Pr@dev v2@fixds
This commit is contained in:
xuwei-fit2cloud 2024-11-06 13:33:30 +08:00 committed by GitHub
commit f78ec4b4fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/datasource/provider/MysqlEngineProvider.java
View File

@ -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;
}
}

8
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@ -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();
@ -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(() -> {