From aade0f63f68d9743ffa53b9c847728c0ef843fe0 Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Tue, 26 Dec 2023 14:59:17 +0800
Subject: [PATCH] =?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}