From 29f36f1474364ae66458a0b7c7164874a419abf9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 8 Nov 2023 18:11:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BC=95=E6=93=8E=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/datasource/server/EngineServer.java   | 7 +++++--
 .../io/dataease/listener/DataSourceInitStartListener.java  | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java
index 676dfa12a3..540f68de30 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java
@@ -122,8 +122,11 @@ public class EngineServer {
             }
             mysqlConfiguration.setHost(matcher.group(1));
             mysqlConfiguration.setPort(Integer.valueOf(matcher.group(2)));
-            mysqlConfiguration.setDataBase(matcher.group(3).split("\\?")[0]);
-            mysqlConfiguration.setExtraParams(matcher.group(3).split("\\?")[1]);
+            String[] databasePrams = matcher.group(3).split("\\?");
+            mysqlConfiguration.setDataBase(databasePrams[0]);
+            if(databasePrams.length == 2){
+                mysqlConfiguration.setExtraParams(databasePrams[1]);
+            }
             mysqlConfiguration.setUsername(env.getProperty("spring.datasource.username"));
             mysqlConfiguration.setPassword(env.getProperty("spring.datasource.password"));
             engine.setConfiguration(JsonUtil.toJSONString(mysqlConfiguration).toString());
diff --git a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
index a54d75b63d..72dbae8e67 100644
--- a/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
+++ b/core/core-backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
@@ -34,7 +34,10 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
         try {
             engineServer.initSimpleEngine();
-            datasourceServer.updateDemoDs();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        try {
             calciteProvider.initConnectionPool();
         }catch (Exception e){
             e.printStackTrace();