From 3ae10f4592eae621396c22da7babf812efef10df Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 5 Apr 2022 21:49:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9B=86=E7=BE=A4=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/ExtractDataService.java    | 7 ++++++-
 .../java/io/dataease/service/kettle/KettleService.java     | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index fe31d15721..85ebe9b281 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -876,7 +876,12 @@ public class ExtractDataService {
             case StarRocks:
                 MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
                 dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfiguration.getHost().trim(), mysqlConfiguration.getDataBase().trim(), mysqlConfiguration.getPort().toString(), mysqlConfiguration.getUsername(), mysqlConfiguration.getPassword());
-                dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8");
+                if(StringUtils.isNotEmpty(mysqlConfiguration.getExtraParams()) && mysqlConfiguration.getExtraParams().split("&").length > 0){
+                    String[] params = mysqlConfiguration.getExtraParams().split("&");
+                    for(int i=0;i<params.length;i++){
+                        dataMeta.addExtraOption("MYSQL", params[i].split("=")[0], params[i].split("=")[1]);
+                    }
+                }
                 transMeta.addDatabase(dataMeta);
                 selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
                 inputStep = inputStep(transMeta, selectSQL);
diff --git a/backend/src/main/java/io/dataease/service/kettle/KettleService.java b/backend/src/main/java/io/dataease/service/kettle/KettleService.java
index 960783fb34..dd34dd0788 100644
--- a/backend/src/main/java/io/dataease/service/kettle/KettleService.java
+++ b/backend/src/main/java/io/dataease/service/kettle/KettleService.java
@@ -67,8 +67,7 @@ public class KettleService {
         httpClientConfig.addHeader("Authorization", authValue);
         try {
             String response = HttpClientUtil.get("http://" + kettleDTO.getCarte() + ":" + kettleDTO.getPort() + "/kettle/status/", httpClientConfig);
-
-            return ResultHolder.error("Kettle is valid.");
+            return ResultHolder.success("Kettle is valid.");
         }catch (Exception e){
             return ResultHolder.error("Kettle is invalid: " + e.getMessage());
         }