From fff26aa5d97b45664522edd79385d4540bf73552 Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Mon, 29 Jul 2024 18:42:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20apisix=20=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=EF=BC=9B=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/docker-compose-apisix.yml | 5 ++---
 installer/install.conf                       | 8 +++++++-
 installer/install.sh                         | 9 +++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/installer/dataease/docker-compose-apisix.yml b/installer/dataease/docker-compose-apisix.yml
index 870814bbd3..16be147291 100644
--- a/installer/dataease/docker-compose-apisix.yml
+++ b/installer/dataease/docker-compose-apisix.yml
@@ -8,7 +8,7 @@ services:
     volumes:
     - ${DE_BASE}/dataease2.0/apisix/dashboard_conf/conf.yaml:/usr/local/apisix-dashboard/conf/conf.yaml
     ports:
-    - 9000:9000
+    - ${DE_APISIX_DASHBOARD_PORT}:9000
     networks:
       dataease-network:
 
@@ -26,8 +26,7 @@ services:
     depends_on:
       - etcd
     ports:
-      - 9180:9180
-      - 9080:9080
+      - ${DE_APISIX_PORT}:9080
     networks:
       dataease-network:
 
diff --git a/installer/install.conf b/installer/install.conf
index 73f7bf6927..8c522c3f71 100644
--- a/installer/install.conf
+++ b/installer/install.conf
@@ -19,7 +19,7 @@ DE_MYSQL_PORT=3306
 DE_MYSQL_DB=dataease
 ## 数据库用户名
 DE_MYSQL_USER=root
-## 数据库密码
+## 数据库密码，密码如包含特殊字符，请用双引号引起来，例如 DE_MYSQL_PASSWORD="Test@4&^%*^"
 DE_MYSQL_PASSWORD=Password123@mysql
 ## 数据库参数
 DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true"
@@ -29,3 +29,9 @@ DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&cha
 DE_SELENIUM_CPU_LIMIT='1'
 ## selenium 镜像 内存 限制
 DE_SELENIUM_MEM_LIMIT=2g
+
+# APISIX配置
+## APISIX dashboard 端口
+DE_APISIX_DASHBOARD_PORT=9000
+## APISIX 端口
+DE_APISIX_PORT=9080
diff --git a/installer/install.sh b/installer/install.sh
index 81eadb5eba..62b656a61d 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -299,9 +299,14 @@ function start_de_service() {
    if [[ $DE_INSTALL_MODE != "community" ]];then
       access_port=9080
    fi
+
    echo
-   echo -e "======================= 安装完成 =======================\n" 2>&1 | tee -a ${CURRENT_DIR}/install.log
-   echo -e "系统登录信息如下:\n\t访问地址: http://服务器IP:$access_port\n\t用户名: admin\n\t初始密码: DataEase@123456" 2>&1 | tee -a ${CURRENT_DIR}/install.log
+   if [[ $INSTALL_TYPE != "upgrade" ]];then
+      echo -e "======================= 安装完成 =======================\n" 2>&1 | tee -a ${CURRENT_DIR}/install.log
+      echo -e "系统登录信息如下:\n\t访问地址: http://服务器IP:$access_port\n\t用户名: admin\n\t初始密码: DataEase@123456" 2>&1 | tee -a ${CURRENT_DIR}/install.log
+   else
+      echo -e "======================= 升级完成 =======================\n" 2>&1 | tee -a ${CURRENT_DIR}/install.log
+   fi
 }
 
 function main() {