From 9997102af2abb9139fbc40d5520314c8fe1dc863 Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Tue, 22 Oct 2024 16:13:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E7=9A=84=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/templates/application.yml |  2 ++
 installer/dectl                              | 11 +++++++----
 installer/install.conf                       | 13 +++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/installer/dataease/templates/application.yml b/installer/dataease/templates/application.yml
index 0d12194450..b766e8a448 100644
--- a/installer/dataease/templates/application.yml
+++ b/installer/dataease/templates/application.yml
@@ -23,6 +23,8 @@ dataease:
       limit: ${DE_EXPORT_DATASET_LIMIT}
   origin-list: ${DE_ORIGIN_LIST}
   login_timeout: ${DE_LOGIN_TIMEOUT}
+  selenium-server: ${DE_SELENIUM_SERVER}
+  dataease-servers: ${DE_SERVERS}
 task:
   executor:
     address: http://sync-task-actuator:9001
diff --git a/installer/dectl b/installer/dectl
index deb7739ac4..006c387e71 100644
--- a/installer/dectl
+++ b/installer/dectl
@@ -49,18 +49,21 @@ function usage() {
 }
 function _generate_compose_file_args() {
    if [[ $DE_INSTALL_MODE != "community" ]];then
-      compose_files="${compose_files} -f docker-compose-apisix.yml"
-      if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]];then
+      if [[ -f $DE_RUNNING_BASE/docker-compose-apisix.yml ]] && [[ "$DE_EXTERNAL_APISIX" != "true" ]];then
+         compose_files="${compose_files} -f docker-compose-apisix.yml"
+      fi
+      
+      if [[ -f $DE_RUNNING_BASE/docker-compose-task.yml ]] && [[ "$DE_EXTERNAL_SYNC_TASK" != "true" ]];then
          compose_files="${compose_files} -f docker-compose-task.yml"
       fi
 
-      if [[ -f $DE_RUNNING_BASE/docker-compose-selenium.yml ]];then
+      if [[ -f $DE_RUNNING_BASE/docker-compose-selenium.yml ]] && [[ "$DE_EXTERNAL_SELENIUM" != "true" ]];then
          compose_files="${compose_files} -f docker-compose-selenium.yml"
       fi
    fi
 }
 function _check_apisix_init() {
-   if [[ $DE_INSTALL_MODE != "community" ]];then
+   if [[ $DE_INSTALL_MODE != "community" ]] && [[ "$DE_EXTERNAL_APISIX" != "true" ]];then
       _prepare_apisix
    fi
 }
diff --git a/installer/install.conf b/installer/install.conf
index c95b15cb97..f7acba4ae3 100644
--- a/installer/install.conf
+++ b/installer/install.conf
@@ -27,18 +27,31 @@ DE_MYSQL_PASSWORD=Password123@mysql
 DE_MYSQL_PARAMS="autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true"
 
 # 定时报告镜像配置
+## 是否使用外部 Selenium，若使用外部 Selenium，则限制参数无效
+DE_EXTERNAL_SELENIUM=false
+## Selenium 服务地址
+DE_SELENIUM_SERVER=http://de-selenium:4444/wd/hub
 ## selenium 镜像 CPU 限制
 DE_SELENIUM_CPU_LIMIT='1'
 ## selenium 镜像 内存 限制
 DE_SELENIUM_MEM_LIMIT=2g
 
 # APISIX配置
+## 是否使用外部 APISIX
+DE_EXTERNAL_APISIX=false
+## 使用外部 APISIX，则下列参数无效
 ## APISIX dashboard 端口
 DE_APISIX_DASHBOARD_PORT=9000
 ## APISIX 端口
 DE_APISIX_PORT=9080
 
+# 同步模块配置
+## 是否使用外部同步模块
+DE_EXTERNAL_SYNC_TASK=false
+
 # 其他配置
 DE_EXPORT_VIEWS_LIMIT=100000
 DE_EXPORT_DATASET_LIMIT=100000
 DE_ORIGIN_LIST="http://localhost:8000"
+## DataEase 节点列表，用于多节点部署，节点以逗号分隔，如 192.168.1.101,192.168.1.102
+DE_SERVERS=dataease