diff --git a/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh b/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh index 07d5a8dbba..458fb9d5b2 100755 --- a/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh +++ b/.github/workflows/cluster-test/mysql/dolphinscheduler_env.sh @@ -21,7 +21,6 @@ export JAVA_HOME=${JAVA_HOME:-/usr/local/openjdk-8} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-mysql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver export SPRING_DATASOURCE_URL="jdbc:mysql://mysql:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false" export SPRING_DATASOURCE_USERNAME=root export SPRING_DATASOURCE_PASSWORD=123456 diff --git a/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh b/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh index 9a6d9797e6..cc9364e31d 100644 --- a/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh +++ b/.github/workflows/cluster-test/postgresql/dolphinscheduler_env.sh @@ -21,7 +21,6 @@ export JAVA_HOME=${JAVA_HOME:-/usr/local/openjdk-8} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver export SPRING_DATASOURCE_URL="jdbc:postgresql://postgres:5432/dolphinscheduler" export SPRING_DATASOURCE_USERNAME=postgres export SPRING_DATASOURCE_PASSWORD=postgres diff --git a/docs/docs/en/architecture/configuration.md b/docs/docs/en/architecture/configuration.md index e3689f9ae9..0f1df00372 100644 --- a/docs/docs/en/architecture/configuration.md +++ b/docs/docs/en/architecture/configuration.md @@ -450,7 +450,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME export SPRING_DATASOURCE_URL export SPRING_DATASOURCE_USERNAME export SPRING_DATASOURCE_PASSWORD diff --git a/docs/docs/en/guide/installation/pseudo-cluster.md b/docs/docs/en/guide/installation/pseudo-cluster.md index a37e0b58e4..eb0c0d95af 100644 --- a/docs/docs/en/guide/installation/pseudo-cluster.md +++ b/docs/docs/en/guide/installation/pseudo-cluster.md @@ -114,7 +114,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler" export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_PASSWORD={password} @@ -179,7 +178,6 @@ Then, modify `./bin/env/dolphinscheduler_env.sh` to use mysql, change {user} and ```shell export DATABASE=${DATABASE:-mysql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false" export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_PASSWORD={password} diff --git a/docs/docs/en/guide/start/docker.md b/docs/docs/en/guide/start/docker.md index 82bb609772..b12378f9c3 100644 --- a/docs/docs/en/guide/start/docker.md +++ b/docs/docs/en/guide/start/docker.md @@ -77,8 +77,6 @@ $ DOLPHINSCHEDULER_VERSION=3.0.0-beta-1 # Initialize the database, make sure database already exists $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ - # Use "com.mysql.cj.jdbc.driver" if you use MySQL - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -87,7 +85,6 @@ $ docker run -d --name dolphinscheduler-tools \ # Starting DolphinScheduler service $ docker run -d --name dolphinscheduler-master \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -96,7 +93,6 @@ $ docker run -d --name dolphinscheduler-master \ -d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}" $ docker run -d --name dolphinscheduler-worker \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -105,7 +101,6 @@ $ docker run -d --name dolphinscheduler-worker \ -d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}" $ docker run -d --name dolphinscheduler-api \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -114,7 +109,6 @@ $ docker run -d --name dolphinscheduler-api \ -d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}" $ docker run -d --name dolphinscheduler-alert-server \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ diff --git a/docs/docs/en/guide/upgrade.md b/docs/docs/en/guide/upgrade.md index be901a6a50..5e4c7d5812 100644 --- a/docs/docs/en/guide/upgrade.md +++ b/docs/docs/en/guide/upgrade.md @@ -27,7 +27,6 @@ jar package and add it to the `./tools/libs` directory, then change `./bin/ env/ ```shell export DATABASE=${DATABASE:-mysql} export SPRING_PROFILES_ACTIVE=${DATABASE} - export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver export SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_PASSWORD={password} diff --git a/docs/docs/zh/architecture/configuration.md b/docs/docs/zh/architecture/configuration.md index 698a1c4aa2..14f79f1344 100644 --- a/docs/docs/zh/architecture/configuration.md +++ b/docs/docs/zh/architecture/configuration.md @@ -431,7 +431,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME export SPRING_DATASOURCE_URL export SPRING_DATASOURCE_USERNAME export SPRING_DATASOURCE_PASSWORD diff --git a/docs/docs/zh/guide/installation/pseudo-cluster.md b/docs/docs/zh/guide/installation/pseudo-cluster.md index f76b834adc..2ade7be397 100644 --- a/docs/docs/zh/guide/installation/pseudo-cluster.md +++ b/docs/docs/zh/guide/installation/pseudo-cluster.md @@ -111,7 +111,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver export SPRING_DATASOURCE_URL="jdbc:postgresql://127.0.0.1:5432/dolphinscheduler" export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_PASSWORD={password} @@ -176,7 +175,6 @@ mysql> FLUSH PRIVILEGES; ```shell export DATABASE=${DATABASE:-mysql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver export SPRING_DATASOURCE_URL="jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false" export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_PASSWORD={password} diff --git a/docs/docs/zh/guide/start/docker.md b/docs/docs/zh/guide/start/docker.md index 9a0e6f792b..193a3ec3ee 100644 --- a/docs/docs/zh/guide/start/docker.md +++ b/docs/docs/zh/guide/start/docker.md @@ -69,8 +69,6 @@ $ DOLPHINSCHEDULER_VERSION=3.0.0-beta-1 # 初始化数据库,其确保数据库 已经存在 $ docker run -d --name dolphinscheduler-tools \ -e DATABASE="postgresql" \ - # 如果使用 MySQL 则使用 "com.mysql.cj.jdbc.driver" - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -79,7 +77,6 @@ $ docker run -d --name dolphinscheduler-tools \ # 启动 DolphinScheduler 对应的服务 $ docker run -d --name dolphinscheduler-master \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -88,7 +85,6 @@ $ docker run -d --name dolphinscheduler-master \ -d apache/dolphinscheduler-master:"${DOLPHINSCHEDULER_VERSION}" $ docker run -d --name dolphinscheduler-worker \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -97,7 +93,6 @@ $ docker run -d --name dolphinscheduler-worker \ -d apache/dolphinscheduler-worker:"${DOLPHINSCHEDULER_VERSION}" $ docker run -d --name dolphinscheduler-api \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ @@ -106,7 +101,6 @@ $ docker run -d --name dolphinscheduler-api \ -d apache/dolphinscheduler-api:"${DOLPHINSCHEDULER_VERSION}" $ docker run -d --name dolphinscheduler-alert-server \ -e DATABASE="postgresql" \ - -e SPRING_DATASOURCE_DRIVER_CLASS_NAME="org.postgresql.Driver" \ -e SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/dolphinscheduler" \ -e SPRING_DATASOURCE_USERNAME="" \ -e SPRING_DATASOURCE_PASSWORD="" \ diff --git a/docs/docs/zh/guide/upgrade.md b/docs/docs/zh/guide/upgrade.md index 763d9ac963..a9eb3e2188 100644 --- a/docs/docs/zh/guide/upgrade.md +++ b/docs/docs/zh/guide/upgrade.md @@ -26,7 +26,6 @@ jar 包 并添加到 `./tools/libs` 目录下,修改 `./bin/env/dolphinschedul ```shell export DATABASE=${DATABASE:-mysql} export SPRING_PROFILES_ACTIVE=${DATABASE} - export SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver export SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8 export SPRING_DATASOURCE_USERNAME={user} export SPRING_DATASOURCE_PASSWORD={password} diff --git a/script/env/dolphinscheduler_env.sh b/script/env/dolphinscheduler_env.sh index 26eda694db..6e9d3aa78f 100755 --- a/script/env/dolphinscheduler_env.sh +++ b/script/env/dolphinscheduler_env.sh @@ -21,7 +21,6 @@ export JAVA_HOME=${JAVA_HOME:-/opt/soft/java} # Database related configuration, set database type, username and password export DATABASE=${DATABASE:-postgresql} export SPRING_PROFILES_ACTIVE=${DATABASE} -export SPRING_DATASOURCE_DRIVER_CLASS_NAME export SPRING_DATASOURCE_URL export SPRING_DATASOURCE_USERNAME export SPRING_DATASOURCE_PASSWORD