From 6546696f98f3bc3dc657a0a535b33f186e37ef5e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 21 Jun 2024 18:31:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20impala=20jdbc=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/datasource/provider/CalciteProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
index 947ec1c0cd..e0af11c435 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
@@ -393,7 +393,7 @@ public class CalciteProvider {
                 configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Impala.class);
                 if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
                     if (configuration.getJdbcUrl().contains("password=")) {
-                        String[] params = configuration.getJdbcUrl().split(";")[1].split("&");
+                        String[] params = configuration.getJdbcUrl().split(";");
                         String pd = "";
                         for (int i = 0; i < params.length; i++) {
                             if (params[i].contains("password=")) {

From fd792032825bf1a62d1351113e6aff955a1abb6a Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 25 Jun 2024 10:56:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsql=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=B8=AD=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/commons/utils/SqlparserUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
index 83c744b1f4..001ac67382 100644
--- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
@@ -561,7 +561,7 @@ public class SqlparserUtils {
         if (sqlVariableDetails.getOperator().equals("in")) {
             return "'" + String.join("','", sqlVariableDetails.getValue()) + "'";
         } else if (sqlVariableDetails.getOperator().equals("between")) {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(sqlVariableDetails.getType().size() > 1 ? (String) sqlVariableDetails.getType().get(1).replace("DD", "dd") : "YYYY");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat(sqlVariableDetails.getType().size() > 1 ? (String) sqlVariableDetails.getType().get(1).replace("DD", "dd").replace("YYYY", "yyyy") : "yyyy");
             if (StringUtils.endsWith(sqlVariableDetails.getId(), START_END_SEPARATOR)) {
                 return simpleDateFormat.format(new Date(Long.parseLong((String) sqlVariableDetails.getValue().get(1))));
             } else {