From 85012cb42eb2401d3f240b209653e609309972e8 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 23 Feb 2022 17:43:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20API=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/datasource/ApiProvider.java | 2 +- .../java/io/dataease/service/datasource/DatasourceService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index fe73989a2e..948b9710d1 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -185,7 +185,7 @@ public class ApiProvider extends DatasourceProvider{ int i = 0; while (it.hasNext()){ Map.Entry entry = (Map.Entry)it.next(); - row[i] = Optional.ofNullable(entry.getValue()).orElse("").toString(); + row[i] = Optional.ofNullable(entry.getValue()).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "); i++; } dataList.add(row); diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java index d684fefe15..e1a360d7f0 100644 --- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java +++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java @@ -310,7 +310,7 @@ public class DatasourceService { Iterator it = data.entrySet().iterator(); while (it.hasNext()){ Map.Entry entry = (Map.Entry)it.next(); - jsonObject.put((String) entry.getKey(), entry.getValue()); + jsonObject.put((String) entry.getKey(), Optional.ofNullable(entry.getValue()).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ")); if(getFileds) { DatasetTableField tableField = new DatasetTableField(); tableField.setOriginName((String) entry.getKey());