From a3ca7387c93ffbfa8ccb03fb2d9358acd2e569d4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 15 May 2023 12:37:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Excel=E5=8C=85=E5=90=ABEmoji=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=AF=BC=E5=85=A5=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/engine/EngineService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/engine/EngineService.java b/backend/src/main/java/io/dataease/service/engine/EngineService.java index 3089f547ca..6f572f8fb5 100644 --- a/backend/src/main/java/io/dataease/service/engine/EngineService.java +++ b/backend/src/main/java/io/dataease/service/engine/EngineService.java @@ -227,6 +227,9 @@ public class EngineService { mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2))); mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]); mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]); + if(StringUtils.isNotEmpty(mysqlConfiguration.getExtraParams()) && !mysqlConfiguration.getExtraParams().contains("connectionCollation")){ + mysqlConfiguration.setExtraParams(mysqlConfiguration.getExtraParams() + "&connectionCollation=utf8mb4_general_ci"); + } mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username")); mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password")); engine.setConfiguration(new Gson().toJson(mysqlConfiguration));