From 2f0cb4d6e4ce71aaaa95875eebea3e01d793a35a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 26 Dec 2023 12:48:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/view/official/handler/SymbolMapRSHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java index 018efca7a9..cf0f335db4 100644 --- a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java +++ b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java @@ -142,7 +142,7 @@ public class SymbolMapRSHandler implements PluginViewRSHandler { if (StringUtils.isBlank(val)) return val; String typeField = field.getTypeField(); if (StringUtils.isNotBlank(typeField) && trans2Ykeys.contains(typeField)) { - return Arrays.stream(val.split(",")).distinct().collect(Collectors.joining(",")); + return Arrays.stream(val.split(",")).map(StringUtils::trim).distinct().collect(Collectors.joining(",")); } return val; } From aade0f63f68d9743ffa53b9c847728c0ef843fe0 Mon Sep 17 00:00:00 2001 From: xuwei-fit2cloud Date: Tue, 26 Dec 2023 14:59:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=AF=86=E7=A0=81=E8=A2=AB=E9=87=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/dataease/install.conf | 2 ++ installer/dataease/install.sh | 2 ++ installer/dataease/templates/dataease.properties | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/installer/dataease/install.conf b/installer/dataease/install.conf index 43c0f467f6..52e9d28955 100644 --- a/installer/dataease/install.conf +++ b/installer/dataease/install.conf @@ -15,6 +15,8 @@ DE_DORIS_FE_IP=172.19.0.198 DE_DORIS_BE_IP=172.19.0.199 ## 登录超时时间，单位min。如果不设置则默认8小时，也就是480 DE_LOGIN_TIMEOUT=480 +## 新建用户初始密码 +DE_INIT_PASSWORD=DataEase123456 # 数据库配置 ## 是否使用外部数据库 diff --git a/installer/dataease/install.sh b/installer/dataease/install.sh index 53147d0d39..6560f67d28 100755 --- a/installer/dataease/install.sh +++ b/installer/dataease/install.sh @@ -75,10 +75,12 @@ echo -e "*******************************************************\n" 2>&1 | tee - if [[ -f $dataease_conf ]]; then DE_LOGIN_TIMEOUT=$(prop $dataease_conf dataease.login_timeout) + DE_INIT_PASSWORD=$(prop $dataease_conf dataease.init_password) DE_MYSQL_PARAMS=$(grep -P "^\s*[^#]?spring.datasource.url=.*$" $dataease_conf | cut -d'=' --complement -f1 | awk -F'?' '{print $2}') fi export DE_MYSQL_PARAMS export DE_LOGIN_TIMEOUT=$([[ -z $DE_LOGIN_TIMEOUT ]] && echo -n 480 || echo -n $DE_LOGIN_TIMEOUT) +export DE_INIT_PASSWORD=$([[ -z $DE_INIT_PASSWORD ]] && echo -n DataEase123456 || echo -n $DE_INIT_PASSWORD) if [[ -f $dataease_conf ]] && [[ ! ${DE_EXTERNAL_DORIS} ]]; then export DE_DORIS_DB=$(prop $dataease_conf doris.db) diff --git a/installer/dataease/templates/dataease.properties b/installer/dataease/templates/dataease.properties index 64c1a3db5e..78df8f2a1c 100644 --- a/installer/dataease/templates/dataease.properties +++ b/installer/dataease/templates/dataease.properties @@ -16,7 +16,7 @@ doris.port=${DE_DORIS_PORT} doris.httpPort=${DE_DORIS_HTTPPORT} #新建用户初始密码 -dataease.init_password=DataEase123456 +dataease.init_password=${DE_INIT_PASSWORD} #登录超时时间单位min 如果不设置 默认8小时也就是480 dataease.login_timeout=${DE_LOGIN_TIMEOUT} From cad49b4915a8ac5970956de8c19aadddc3f89a9d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 26 Dec 2023 15:01:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E6=9D=A1=E5=BD=A2=E5=9B=BE?= =?UTF-8?q?=E6=8A=A5=E9=94=99NPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 8b18ea90be..d3c8a7f4a5 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -1503,7 +1503,7 @@ public class ChartViewService { if (CollectionUtils.isNotEmpty(detailData)) { mapTableNormal = ChartDataBuild.transTableNormalWithDetail(xAxis, yAxis, data, detailFieldList, detailData, desensitizationList); } else { - if (StringUtils.equalsIgnoreCase(view.getType(), "bar-time-range") && !drillRequestList.isEmpty() && !xAxisExt.isEmpty()) { // 针对区间条形图，还需要给xAxis排个序, 把xAxisExt放到最后 + if (StringUtils.equalsIgnoreCase(view.getType(), "bar-time-range") && CollectionUtils.isNotEmpty(drillRequestList) && CollectionUtils.isNotEmpty(xAxisExt)) { // 针对区间条形图，还需要给xAxis排个序, 把xAxisExt放到最后 int count = 0; for (int i = xAxis.size() - drillRequestList.size() - 1; i >= 0; i--) { xAxis.remove(i);