From d1107c5625fb78f31605d2e80e0867db10801057 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 1 Dec 2023 16:39:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=E5=88=97=E6=9D=83=E9=99=90=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=84=B1=E6=95=8F=E6=A0=BC=E5=BC=8F=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/chart/utils/ChartDataBuild.java | 4 ++-- .../io/dataease/datasource/server/DatasourceServer.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java index a4ca90c54a..21d99e6ed7 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java +++ b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java @@ -1106,11 +1106,11 @@ public class ChartDataBuild { break; } if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() >= columnPermissionItem.getDesensitizationRule().getN()) { - desensitizationStr = "***" + StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***"; + desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***"; break; } if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() < columnPermissionItem.getDesensitizationRule().getN()) { - desensitizationStr = "***" + StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, originStr.length()); + desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, originStr.length()); } break; default: 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 8ef8b3c598..7296453e33 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,7 @@ public class DatasourceServer implements DatasourceApi { try { datasourceSyncManage.createEngineTable(datasourceRequest.getTable(), tableFields); } catch (Exception e) { - DEException.throwException("Failed to create table " + datasourceRequest.getTable()); + DEException.throwException("Failed to create table " + datasourceRequest.getTable() + ", " + e.getMessage()); } } commonThreadPool.addTask(() -> { @@ -409,7 +409,7 @@ public class DatasourceServer implements DatasourceApi { try { datasourceSyncManage.createEngineTable(toCreateTable, ApiUtils.getTableFields(datasourceRequest)); } catch (Exception e) { - DEException.throwException("Failed to create table " + toCreateTable); + DEException.throwException("Failed to create table " + toCreateTable + ", " + e.getMessage()); } } datasourceSyncManage.deleteSchedule(datasourceTaskServer.selectByDSId(dataSourceDTO.getId())); @@ -425,7 +425,7 @@ public class DatasourceServer implements DatasourceApi { try { datasourceSyncManage.dropEngineTable(deleteTable); } catch (Exception e) { - DEException.throwException("Failed to drop table " + deleteTable); + DEException.throwException("Failed to drop table " + deleteTable + ", " + e.getMessage()); } } for (String toCreateTable : toCreateTables) { @@ -433,7 +433,7 @@ public class DatasourceServer implements DatasourceApi { try { datasourceSyncManage.createEngineTable(toCreateTable, ExcelUtils.getTableFields(datasourceRequest)); } catch (Exception e) { - DEException.throwException("Failed to create table " + toCreateTable); + DEException.throwException("Failed to create table " + toCreateTable + ", " + e.getMessage()); } } datasourceSyncManage.extractExcelData(requestDatasource, "all_scope");